diff --git a/nix/modules/nixos/virtualisation/qemu-guest/default.nix b/nix/modules/nixos/virtualisation/qemu-guest/default.nix
index f40f946..86837cc 100644
--- a/nix/modules/nixos/virtualisation/qemu-guest/default.nix
+++ b/nix/modules/nixos/virtualisation/qemu-guest/default.nix
@@ -25,23 +25,28 @@ in
 
   imports = [ ./profile.nix ];
 
-  config = lib.mkIf cfg.enable {
-    services.qemuGuest.enable = true;
-    virtualisation = lib.mkIf cfg.enableWhenVmTarget {
-      vmVariant = {
-        khscodes.virtualisation.qemu-guest.enable = true;
-        services.spice-vdagentd.enable = true;
-        virtualisation = {
-          memorySize = 1024 * 8;
-          qemu = {
-            options = [
-              "-smp 8"
-              "-vga none -device virtio-gpu-gl,hostmem=2G,blob=true,venus=true"
-              rng
-            ] ++ spice;
+  config = lib.mkMerge [
+    (lib.mkIf cfg.enable {
+      services.qemuGuest.enable = true;
+    })
+    (lib.mkIf cfg.enableWhenVmTarget {
+      virtualisation = {
+        vmVariant = {
+          khscodes.virtualisation.qemu-guest.enable = true;
+          services.spice-vdagentd.enable = true;
+          virtualisation = {
+            memorySize = 1024 * 8;
+            qemu = {
+              options = [
+                "-smp 8"
+                "-vga none -device virtio-gpu-gl,hostmem=2G,blob=true,venus=true"
+                rng
+              ]
+              ++ spice;
+            };
           };
         };
       };
-    };
-  };
+    })
+  ];
 }
diff --git a/nix/systems/x86_64-linux/desktop.kaareskovgaard.net/default.nix b/nix/systems/x86_64-linux/desktop.kaareskovgaard.net/default.nix
index 48e5dcf..5e6b310 100644
--- a/nix/systems/x86_64-linux/desktop.kaareskovgaard.net/default.nix
+++ b/nix/systems/x86_64-linux/desktop.kaareskovgaard.net/default.nix
@@ -10,6 +10,5 @@
     device = "/dev/sda";
     diskName = "nixos";
   };
-  khscodes.users.khs.enable = true;
   system.stateVersion = "25.05";
 }