diff --git a/hosts/jude/default.nix b/hosts/jude/default.nix
index 44b1300..a372532 100644
--- a/hosts/jude/default.nix
+++ b/hosts/jude/default.nix
@@ -37,6 +37,7 @@
     gnome.enable = true;
     kde.enable = false;
     print.enable = true;
+    remote-builder.enable = true;
   };
 
   boot.extraModulePackages = [ config.boot.kernelPackages.v4l2loopback ];
@@ -70,7 +71,6 @@
         makemkv
         oathToolkit
         usbutils
-        vagrant
         ventoy
       ]
 
@@ -120,6 +120,6 @@
       open = true;
     };
     pulseaudio.enable = false; # This conflicts with pipewire
-    system76.enableAll = true;
+    system76.enableAll = false;
   };
 }
diff --git a/modules/baseline.nix b/modules/baseline.nix
index afdf25c..2adc765 100644
--- a/modules/baseline.nix
+++ b/modules/baseline.nix
@@ -5,7 +5,7 @@
   ...
 }:
 let
-  builderHosts = [ "myself" ];
+  builderHosts = [ "jude" "myself" ];
 in
 {
   # Enable flakes
diff --git a/modules/nixos/remote-builder.nix b/modules/nixos/remote-builder.nix
index 21dfe56..65c4ca5 100644
--- a/modules/nixos/remote-builder.nix
+++ b/modules/nixos/remote-builder.nix
@@ -14,6 +14,7 @@ with lib;
     users.users.remote-builder-user = {
       openssh.authorizedKeys.keys = [
         "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIG4fNCnomQEsFKQZp16LXRqkfXHzzZbGAYJWPMvlGGQy root@exodus"
+        "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMGJjyFVOsF74QKzRITc8z/5MJlIa47P1tMm9Z8HRJLm root@jude"
       ];
       homeMode = "500";
       isNormalUser = true;
diff --git a/modules/nixos/vmdev.nix b/modules/nixos/vmdev.nix
index d2dfa78..f99bb1d 100644
--- a/modules/nixos/vmdev.nix
+++ b/modules/nixos/vmdev.nix
@@ -64,6 +64,7 @@ with lib;
         preStart = "${pkgs.kmod}/bin/modprobe kvm_${cfg.system}";
         postStop = "${pkgs.kmod}/bin/rmmod kvm_${cfg.system} kvm";
         conflicts = [ "vbox.service" ];
+        #overrideStrategy = "asDropin";
       };
       vbox = {
         preStart = "${pkgs.kmod}/bin/modprobe vboxdrv vboxnetadp vboxnetflt";
diff --git a/overlays/default.nix b/overlays/default.nix
index 7616c1f..830ec23 100644
--- a/overlays/default.nix
+++ b/overlays/default.nix
@@ -1,4 +1,4 @@
-_: prev:
+_final: prev:
 
 let
   myPackages =
@@ -44,8 +44,5 @@ rec {
     withBDplus = true;
   };
   handbrake = prev.handbrake.override { libbluray = libbluray-custom; };
-  libvirt-greg = prev.libvirt.overrideAttrs {
-    postInstall = prev.libvirt.postInstall + "rm -r $out/lib/systemd/system/libvirtd.service";
-  };
   pipenv-ivr = prev.callPackage ./pipenv.nix { };
 }