diff --git a/requirements-swh.txt b/requirements-swh.txt
--- a/requirements-swh.txt
+++ b/requirements-swh.txt
@@ -1,4 +1,4 @@
 swh.model >= 2.6.1
-swh.storage >= 0.22.0
+swh.storage >= 0.37.0
 swh.scheduler >= 0.0.39
 swh.loader.core >= 0.18.0
diff --git a/swh/loader/mercurial/from_disk.py b/swh/loader/mercurial/from_disk.py
--- a/swh/loader/mercurial/from_disk.py
+++ b/swh/loader/mercurial/from_disk.py
@@ -272,10 +272,11 @@
         """Get all Mercurial ExtIDs for the targets in the latest snapshot"""
         extids = []
         for extid in self.storage.extid_get_from_target(
-            identifiers.ObjectType.REVISION, targets
+            identifiers.ObjectType.REVISION,
+            targets,
+            extid_type=EXTID_TYPE,
+            extid_version=EXTID_VERSION,
         ):
-            if extid.extid_type != EXTID_TYPE or extid.extid_version != EXTID_VERSION:
-                continue
             extids.append(extid)
             self._revision_nodeid_to_sha1git[
                 HgNodeId(extid.extid)
@@ -301,9 +302,9 @@
         extids = []
 
         for group_ids in grouper(hgnode_ids, n=1000):
-            for extid in self.storage.extid_get_from_extid(EXTID_TYPE, group_ids):
-                if extid.extid_version != EXTID_VERSION:
-                    continue
+            for extid in self.storage.extid_get_from_extid(
+                EXTID_TYPE, group_ids, version=EXTID_VERSION
+            ):
                 extids.append(extid)
                 self._revision_nodeid_to_sha1git[
                     HgNodeId(extid.extid)
@@ -518,8 +519,9 @@
         # The parent was not loaded in this run, get it from storage
         from_storage = [
             extid
-            for extid in self.storage.extid_get_from_extid(EXTID_TYPE, ids=[hg_nodeid])
-            if extid.extid_version == EXTID_VERSION
+            for extid in self.storage.extid_get_from_extid(
+                EXTID_TYPE, ids=[hg_nodeid], version=EXTID_VERSION
+            )
         ]
 
         msg = "Expected 1 match from storage for hg node %r, got %d"