diff --git a/share/sql/sqlite3-prims.sql b/share/sql/sqlite3-prims.sql
index ef6ef5a5b6..c6c399976d 100644
--- a/share/sql/sqlite3-prims.sql
+++ b/share/sql/sqlite3-prims.sql
@@ -52,8 +52,8 @@ create index prims_ownerid on prims(OwnerID);
 create index prims_lastownerid on prims(LastOwnerID);
 
 create table primshapes (
-        id integer primary key autoincrement,
-        prim_id integer not null,
+        -- The same UUID as prim, just to keep them easily linked
+        UUID varchar(36) primary key not null,
         -- Shape is an enum 
         Shape integer, 
         -- vectors (converted from LLVector3)