diff --git a/requirements-swh.txt b/requirements-swh.txt
--- a/requirements-swh.txt
+++ b/requirements-swh.txt
@@ -1,4 +1,4 @@
 swh.model >= 0.0.28
-swh.storage >= 0.0.131
+swh.storage >= 0.0.143
 swh.scheduler
 swh.loader.core >= 0.0.40
diff --git a/swh/loader/npm/loader.py b/swh/loader/npm/loader.py
--- a/swh/loader/npm/loader.py
+++ b/swh/loader/npm/loader.py
@@ -39,7 +39,6 @@
 
     def __init__(self):
         super().__init__(logging_class='swh.loader.npm.NpmLoader')
-        self.origin_id = None
         temp_directory = self.config['temp_directory']
         os.makedirs(temp_directory, exist_ok=True)
         self.temp_directory = mkdtemp(suffix='-%s' % os.getpid(),
@@ -153,10 +152,10 @@
         """
         Retrieve the last snapshot of the npm package if any.
         """
-        snapshot = self.storage.snapshot_get_latest(self.origin_id)
-        if snapshot and snapshot.pop('next_branch', None):
-            snapshot = snapshot_get_all_branches(self.storage, snapshot['id'])
-        return snapshot
+        visit = self.storage.origin_visit_get_latest(
+            self.origin['url'], require_snapshot=True)
+        if visit:
+            return snapshot_get_all_branches(self.storage, visit['snapshot'])
 
     def prepare(self, package_name, package_url, package_metadata_url):
         """