diff --git a/umap/migrations/0018_datalayer_uuid.py b/umap/migrations/0018_datalayer_uuid.py
index 08b84fe57..86c52ec09 100644
--- a/umap/migrations/0018_datalayer_uuid.py
+++ b/umap/migrations/0018_datalayer_uuid.py
@@ -9,7 +9,7 @@
     EXECUTE 'ALTER TABLE umap_datalayer DROP CONSTRAINT ' || (
         SELECT indexname
         FROM pg_indexes
-        WHERE tablename = 'umap_datalayer' AND indexname LIKE '%pk'
+        WHERE tablename = 'umap_datalayer' AND indexname LIKE '%pk%'
     );
 END $$;
 """
@@ -40,6 +40,10 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             "datalayer", name="id", field=models.IntegerField(null=True, blank=True)
         ),
+        # Rename "id" to "old id"
+        migrations.RenameField(
+            model_name="datalayer", old_name="id", new_name="old_id"
+        ),
         # … to put it back on the "uuid"
         migrations.AlterField(
             model_name="datalayer",
@@ -52,5 +56,7 @@ class Migration(migrations.Migration):
                 serialize=False,
             ),
         ),
+        # When applying the migration backwards, we need to drop the pk index
+        # Before addding a new one.
         migrations.RunSQL(migrations.RunSQL.noop, reverse_sql=drop_index),
     ]
diff --git a/umap/migrations/0019_migrate_internal_remote_datalayers.py b/umap/migrations/0019_migrate_internal_remote_datalayers.py
index 59f91cd81..1a0bc77e1 100644
--- a/umap/migrations/0019_migrate_internal_remote_datalayers.py
+++ b/umap/migrations/0019_migrate_internal_remote_datalayers.py
@@ -27,7 +27,7 @@ def migrate_datalayers(apps, schema_editor):
             remote_id = match.group("datalayer_id")
             map_id = match.group("map_id")
             try:
-                remote_uuid = DataLayer.objects.get(id=remote_id).uuid
+                remote_uuid = DataLayer.objects.get(old_id=remote_id).uuid
             except DataLayer.DoesNotExist:
                 pass
             else: