diff --git a/boxes/mlg/default.nix b/boxes/mlg/default.nix
index aa29802..61992fd 100644
--- a/boxes/mlg/default.nix
+++ b/boxes/mlg/default.nix
@@ -2,7 +2,7 @@
 
 {
   imports = [
-    ./hardware-configuration.nix
+#    ./hardware-configuration.nix
     ./nvidia.nix
     ../../modules/bootstrap.nix
     ../../modules/common.nix
diff --git a/boxes/x230t/default.nix b/boxes/x230t/default.nix
index 52ff85b..b4345b9 100644
--- a/boxes/x230t/default.nix
+++ b/boxes/x230t/default.nix
@@ -6,7 +6,6 @@
     ../../modules/bootstrap.nix
     ../../modules/common.nix
     ../../modules/x11.nix
-    ../../modules/discord.nix
   ];
 
   boot.loader.grub.enable = true;
diff --git a/flake.lock b/flake.lock
index de0501b..09ae869 100644
--- a/flake.lock
+++ b/flake.lock
@@ -92,11 +92,11 @@
       "locked": {
         "lastModified": 1,
         "narHash": "sha256-xCQE9SSKWjmoYOaIkzdlGULeGbEF9Gau5TPgYJxalmw=",
-        "path": "/nix/store/rg6mp8f9i9grfp47chg801vxzz4w564f-source/builds",
+        "path": "/nix/store/p4zd0ifx5r5qfr03q5bbg0wilya43x5s-source/builds",
         "type": "path"
       },
       "original": {
-        "path": "/nix/store/rg6mp8f9i9grfp47chg801vxzz4w564f-source/builds",
+        "path": "/nix/store/p4zd0ifx5r5qfr03q5bbg0wilya43x5s-source/builds",
         "type": "path"
       }
     }
diff --git a/flake.nix b/flake.nix
index b1c801b..6ec0836 100644
--- a/flake.nix
+++ b/flake.nix
@@ -24,13 +24,6 @@
         specialArgs = { inherit inputs; };
         modules = [
           ./boxes/virtbox
-          home-manager.nixosModules.home-manager
-          {
-            home-manager.useGlobalPkgs = true;
-            home-manager.useUserPackages = true;
-            home-manager.extraSpecialArgs = { inherit inputs; };
-            home-manager.users.usr = import ./boxes/virtbox/home.nix;
-          }
         ];
       };
       x230t = nixpkgs.lib.nixosSystem {
@@ -38,13 +31,6 @@
         specialArgs = { inherit inputs; };
         modules = [
           ./boxes/x230t
-          home-manager.nixosModules.home-manager
-          {
-            home-manager.useGlobalPkgs = true;
-            home-manager.useUserPackages = true;
-            home-manager.extraSpecialArgs = { inherit inputs; };
-            home-manager.users.usr = import ./boxes/x230t/home.nix;
-          }
         ];
       };
       mainsail = nixpkgs.lib.nixosSystem {
@@ -52,15 +38,31 @@
         specialArgs = { inherit inputs; };
         modules = [
           ./boxes/mainsail
-          home-manager.nixosModules.home-manager
-          {
-            home-manager.useGlobalPkgs = true;
-            home-manager.useUserPackages = true;
-            home-manager.extraSpecialArgs = { inherit inputs; };
-            home-manager.users.usr = import ./boxes/mainsail/home.nix;
-          }
         ];
       };
     };
+    homeConfigurations = {
+      "usr@x230t" = home-manager.lib.homeManagerConfiguration {
+        pkgs = nixpkgs.legacyPackages.x86_64-linux;
+	extraSpecialArgs = { inherit inputs; };
+	modules = [
+	  ./boxes/x230t/home.nix
+	];
+      };
+      "usr@mainsail" = home-manager.lib.homeManagerConfiguration {
+        pkgs = nixpkgs.legacyPackages.x86_64-linux;
+	extraSpecialArgs = { inherit inputs; };
+	modules = [
+	  ./boxes/x230t/home.nix
+	];
+      };
+      "usr@virtbox" = home-manager.lib.homeManagerConfiguration {
+        pkgs = nixpkgs.legacyPackages.x86_64-linux;
+	extraSpecialArgs = { inherit inputs; };
+	modules = [
+	  ./boxes/x230t/home.nix
+	];
+      };
+    };
   };
 }
diff --git a/modules/bootstrap.nix b/modules/bootstrap.nix
index d2a053b..cdf4b36 100644
--- a/modules/bootstrap.nix
+++ b/modules/bootstrap.nix
@@ -1,10 +1,6 @@
 { config, pkgs, ... }:
 
 {
-  imports = [
-    ./hardware-configuration.nix
-  ];
-
   environment.systemPackages = with pkgs; [
     git
     neovim