diff --git a/swh/loader/package/loader.py b/swh/loader/package/loader.py
--- a/swh/loader/package/loader.py
+++ b/swh/loader/package/loader.py
@@ -564,14 +564,15 @@
         revision = attr.evolve(revision, metadata=ImmutableDict(full_metadata))
 
         original_artifact_metadata = RawExtrinsicMetadata(
-            type=MetadataTargetType.REVISION,
-            id=SWHID(object_type="revision", object_id=revision.id),
+            type=MetadataTargetType.DIRECTORY,
+            id=SWHID(object_type="directory", object_id=revision.directory),
             discovery_date=self.visit_date,
             authority=SWH_METADATA_AUTHORITY,
             fetcher=self.get_metadata_fetcher(),
             format="original-artifacts-json",
             metadata=json.dumps(metadata).encode(),
             origin=self.url,
+            revision=SWHID(object_type="revision", object_id=revision.id),
         )
         self._load_metadata_objects([original_artifact_metadata])
 
diff --git a/swh/loader/package/tests/test_loader_metadata.py b/swh/loader/package/tests/test_loader_metadata.py
--- a/swh/loader/package/tests/test_loader_metadata.py
+++ b/swh/loader/package/tests/test_loader_metadata.py
@@ -112,7 +112,7 @@
             date=None,
             committer_date=None,
             type=RevisionType.TAR,
-            directory=b"foo",
+            directory=DIRECTORY_ID,
             synthetic=False,
         )
 
@@ -155,19 +155,20 @@
     )
 
     result = storage.raw_extrinsic_metadata_get(
-        MetadataTargetType.REVISION, REVISION_SWHID, authority,
+        MetadataTargetType.DIRECTORY, DIRECTORY_SWHID, authority,
     )
     assert result.next_page_token is None
     assert len(result.results) == 1
     assert result.results[0] == RawExtrinsicMetadata(
-        type=MetadataTargetType.REVISION,
-        id=REVISION_SWHID,
+        type=MetadataTargetType.DIRECTORY,
+        id=DIRECTORY_SWHID,
         discovery_date=result.results[0].discovery_date,
         authority=authority,
         fetcher=FETCHER,
         format="original-artifacts-json",
         metadata=b'[{"artifact_key": "value", "length": 0}]',
         origin=ORIGIN_URL,
+        revision=REVISION_SWHID,
     )