diff --git a/requirements-swh.txt b/requirements-swh.txt
--- a/requirements-swh.txt
+++ b/requirements-swh.txt
@@ -1,4 +1,4 @@
 swh.core >= 0.0.75
-swh.model >= 0.3.0
+swh.model >= 0.3.5
 swh.scheduler
 swh.storage >= 0.8.0
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
@@ -410,14 +410,15 @@
 
             for obj in directory.iter_tree():
                 obj = obj.to_model()
-                if isinstance(obj, Content):
+                obj_type = obj.object_type
+                if obj_type in ("content", "content_file"):
                     # FIXME: read the data from disk later (when the
                     # storage buffer is flushed).
                     obj = obj.with_data()
                     contents.append(obj)
-                elif isinstance(obj, SkippedContent):
+                elif obj_type == "skipped_content":
                     skipped_contents.append(obj)
-                elif isinstance(obj, Directory):
+                elif obj_type == "directory":
                     directories.append(obj)
                 else:
                     raise TypeError(f"Unexpected content type from disk: {obj}")