diff --git a/flake.lock b/flake.lock
index 9b1f7e5..3d481e6 100644
--- a/flake.lock
+++ b/flake.lock
@@ -18,6 +18,24 @@
         "type": "github"
       }
     },
+    "flake-utils_2": {
+      "inputs": {
+        "systems": "systems_2"
+      },
+      "locked": {
+        "lastModified": 1681202837,
+        "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "cfacdce06f30d2b68473a46042957675eebb3401",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
     "home-manager": {
       "inputs": {
         "nixpkgs": [
@@ -81,7 +99,8 @@
       "inputs": {
         "home-manager": "home-manager",
         "nil": "nil",
-        "nixpkgs": "nixpkgs"
+        "nixpkgs": "nixpkgs",
+        "vscode-server": "vscode-server"
       }
     },
     "rust-overlay": {
@@ -123,6 +142,42 @@
         "repo": "default",
         "type": "github"
       }
+    },
+    "systems_2": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
+    "vscode-server": {
+      "inputs": {
+        "flake-utils": "flake-utils_2",
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1684517665,
+        "narHash": "sha256-SaAr66uCQ8CF75jIr23FZjk1+9Kfwm5sQnwV25206Gs=",
+        "owner": "nix-community",
+        "repo": "nixos-vscode-server",
+        "rev": "1e1358493df6529d4c7bc4cc3066f76fd16d4ae6",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "nixos-vscode-server",
+        "type": "github"
+      }
     }
   },
   "root": "root",
diff --git a/flake.nix b/flake.nix
index 820b063..6b46d6d 100644
--- a/flake.nix
+++ b/flake.nix
@@ -29,6 +29,7 @@
         # Specify your home configuration modules here, for example,
         # the path to your home.nix.
         modules = [ 
+          vscode-server.homeModules.default
           ./home.nix 
           ./programs.nix
           ./services.nix
@@ -38,7 +39,6 @@
         # to pass through arguments to home.nix
         extraSpecialArgs = {
           nil = nil.packages.${system};
-          vscode-server = vscode-server.pakcages.${system};
         };
       };
     };
diff --git a/services.nix b/services.nix
index 14fbdf1..4ff46bb 100644
--- a/services.nix
+++ b/services.nix
@@ -1,7 +1,3 @@
 {
-  imports = [
-    <vscode-server>/modules/vscode-server/home.nix
-  ];
-
   services.vscode-server.enable = true;
 }