diff --git a/systems/common.nix b/systems/common.nix
index 0e3d668..70ff866 100644
--- a/systems/common.nix
+++ b/systems/common.nix
@@ -107,6 +107,8 @@
     unzip
     clinfo
     python3
+    virt-manager
+    adoptopenjdk-icedtea-web
   ];
 
   services.xserver.excludePackages = [ pkgs.xterm ];
@@ -129,10 +131,7 @@
         dates = "weekly";
       };
     };
-    virtualbox.host = {
-      enable = true;
-      enableExtensionPack = true;
-    };
+    libvirtd.enable = true;
+    spiceUSBRedirection.enable = true;
   };
-  users.extraGroups.vboxusers.members = [ "jsutter" ];
 }
diff --git a/users/jsutter.nix b/users/jsutter.nix
index b5637e3..ff36316 100644
--- a/users/jsutter.nix
+++ b/users/jsutter.nix
@@ -22,7 +22,7 @@ in
   users.users.jsutter = {
     isNormalUser = true;
     description = "Julian Sutter";
-    extraGroups = [ "networkmanager" "wheel" "docker" "adbusers"];
+    extraGroups = [ "networkmanager" "wheel" "docker" "adbusers" "libvirtd" ];
     hashedPassword = "$6$tvkhGd24G6pVOsWr$j8ZAqSnXPTGwMGmIulU5Puzqd4iKdu8eAMSFis/cPqTW6u2xGQMqPHH1W9IZwKSL6.nS7Jc/NR2VwpPosyXDH/";
     openssh.authorizedKeys.keys  = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBNVUh+RrcOSMRV6qysnsdPs5AyK8dSm4QhhnwgpikyI jsutter@symbiotrip.com" ];
     packages = with pkgs; [