diff --git a/flake.nix b/flake.nix
index 9fe65282..36134494 100644
--- a/flake.nix
+++ b/flake.nix
@@ -58,6 +58,21 @@
         ];
         specialArgs = { inherit inputs; };
       };
+      skinnyv = nixpkgs.lib.nixosSystem {
+        system = "x86_64-linux";
+        modules = [
+          (import ./nixos/boxes/skinnyv)
+
+          home-manager.nixosModules.home-manager
+          {
+            home-manager.useGlobalPkgs = true;
+            home-manager.useUserPackages = true;
+            home-manager.users.cyryl = import ./nixos/home-manager;
+          }
+
+        ];
+        specialArgs = { inherit inputs; };
+      };
     };
   };
 }
diff --git a/nixos/boxes/skinnyv/default.nix b/nixos/boxes/skinnyv/default.nix
index 5f6f6000..1af68693 100644
--- a/nixos/boxes/skinnyv/default.nix
+++ b/nixos/boxes/skinnyv/default.nix
@@ -3,7 +3,6 @@
   networking.hostName = "skinnyv";
 
   imports = [
-    <home-manager/nixos>
     ./hardware-configuration.nix
     ../../boot.nix
     ../../common.nix
@@ -22,14 +21,4 @@
   time.timeZone = "Europe/London";
 
   fonts.fontconfig.enable = true;
-  home-manager.users.cyryl = {...}: {
-    imports = [
-      ../../home-manager
-    ];
-    home.stateVersion = config.system.stateVersion;
-
-    nixpkgs.overlays = config.nixpkgs.overlays;
-    nixpkgs.config = config.nixpkgs.config;
-  };
-
 }