diff --git a/src/sugar/datastore/datastore.py b/src/sugar/datastore/datastore.py
index ed2e6a59..80d5936b 100644
--- a/src/sugar/datastore/datastore.py
+++ b/src/sugar/datastore/datastore.py
@@ -181,6 +181,7 @@ def write(ds_object, update_mtime=True, transfer_ownership=False,
         ds_object.object_id = dbus_helpers.create(properties,
                                                   file_path,
                                                   transfer_ownership)
+        ds_object.metadata['uid'] = ds_object.object_id
         # TODO: register the object for updates
     logging.debug('Written object %s to the datastore.' % ds_object.object_id)