diff --git a/1systems/vbob.nix b/1systems/vbob.nix
index a24cefd..b8c02cb 100644
--- a/1systems/vbob.nix
+++ b/1systems/vbob.nix
@@ -59,7 +59,6 @@ in {
     buildbot
     buildbot-slave
     get
-    genid
   ];
 
   networking.firewall.allowedTCPPorts = [
diff --git a/3modules/buildbot/master.nix b/3modules/buildbot/master.nix
index 58e2f81..09edac9 100644
--- a/3modules/buildbot/master.nix
+++ b/3modules/buildbot/master.nix
@@ -204,7 +204,7 @@ let
   imp = {
 
     users.extraUsers.buildbotMaster = {
-      uid = 672626386; #genid buildbotMaster
+      uid = genid "buildbotMaster";
       description = "Buildbot Master";
       home = cfg.workDir;
       createHome = false;
diff --git a/3modules/buildbot/slave.nix b/3modules/buildbot/slave.nix
index 69d0361..7c9ea79 100644
--- a/3modules/buildbot/slave.nix
+++ b/3modules/buildbot/slave.nix
@@ -127,7 +127,7 @@ let
   imp = {
 
     users.extraUsers.buildbotSlave = {
-      uid = 1408105834; #genid buildbotMaster
+      uid = genid "buildbotSlave";
       description = "Buildbot Slave";
       home = cfg.workDir;
       createHome = false;