diff --git a/custom/default.nix b/custom/default.nix
index 3f07c18..0b0f454 100644
--- a/custom/default.nix
+++ b/custom/default.nix
@@ -1,5 +1,4 @@
 {
   username = "andreas";
-  system = "x86_64-linux";
   version = "22.05";
 }
diff --git a/flake.nix b/flake.nix
index 0f845b1..eb1c1dd 100644
--- a/flake.nix
+++ b/flake.nix
@@ -37,65 +37,44 @@
       custom = import ./custom;
       mkComputer = import "${inputs.self}/lib/mk_computer.nix";
       mkRaspi = import "${inputs.self}/lib/mk_raspi.nix";
-
-      system = custom.system;
-      username = custom.username;
-
-      overlay-unstable = final: prev: {
-        unstable = import nixpkgs-unstable {
-          system = custom.system;
-          config.allowUnfree = true;
-        };
-      };
-
-      pkgs = import nixpkgs {
-        inherit system;
-        config = {
-          allowUnfree = true;
-        };
-        overlays = [
-          overlay-unstable
-          inputs.nix-alien.overlay
-        ];
-      };
     in
     {
       nixosConfigurations = {
         gwyn = mkComputer {
           hostname = "gwyn";
           home-module = "desktop";
-          inherit custom pkgs inputs;
+          inherit custom inputs;
         };
         nixos-vm = mkComputer {
           hostname = "desktop-vm";
           home-module = "desktop";
-          inherit custom pkgs inputs;
+          inherit custom inputs;
         };
         staubfinger = mkComputer {
           hostname = "staubfinger";
           home-module = "desktop";
-          inherit custom pkgs inputs;
+          inherit custom inputs;
         };
         # Servers
         git = mkComputer {
           hostname = "git";
-          inherit custom pkgs inputs;
+          inherit custom inputs;
         };
         mail = mkComputer {
           hostname = "mail";
-          inherit custom pkgs inputs;
+          inherit custom inputs;
         };
         nextcloud = mkComputer {
           hostname = "nextcloud";
-          inherit custom pkgs inputs;
+          inherit custom inputs;
         };
         pihole = mkComputer {
           hostname = "pihole";
-          inherit custom pkgs inputs;
+          inherit custom inputs;
         };
         plex = mkComputer {
           hostname = "plex";
-          inherit custom pkgs inputs;
+          inherit custom inputs;
         };
         proxy = mkRaspi {
           hostname = "proxy";
@@ -103,25 +82,26 @@
         };
         raspi-test = mkRaspi {
           hostname = "raspi-test";
-          inherit custom pkgs inputs;
+          inherit custom inputs;
         };
         restic-server = mkComputer {
           hostname = "restic-server";
-          inherit custom pkgs inputs;
+          inherit custom inputs;
         };
         test-server = mkComputer {
           hostname = "test-server";
-          inherit custom pkgs inputs;
+          inherit custom inputs;
         };
         ttrss = mkComputer {
           hostname = "ttrss";
-          inherit custom pkgs inputs;
+          inherit custom inputs;
         };
       };
       homeConfigurations = {
         "${custom.username}@co-ws-con4" = home-manager.lib.homeManagerConfiguration {
           configuration = import "${inputs.self}/home-manager/work-wsl.nix";
-          inherit system username;
+          system = "x86_64";
+          username = custom.username;
           homeDirectory = "/home/${custom.username}";
           extraSpecialArgs = {
             inherit custom inputs;
diff --git a/home-manager/software/emacs/emacs.d/lib/vterm.el b/home-manager/software/emacs/emacs.d/lib/vterm.el
index d36bbbe..6ebb6ce 100644
--- a/home-manager/software/emacs/emacs.d/lib/vterm.el
+++ b/home-manager/software/emacs/emacs.d/lib/vterm.el
@@ -3,7 +3,7 @@
   :config
   (setq vterm-kill-buffer-on-exit t
         vterm-disable-bold t)
-  (global-set-key (kbd "M RET") 'vterm)
+  (global-set-key (kbd "M-RET") 'vterm)
   (evil-set-initial-state 'vterm-mode 'emacs))
 
 (use-package multi-vterm
diff --git a/lib/mk_computer.nix b/lib/mk_computer.nix
index 881d82b..577b26e 100644
--- a/lib/mk_computer.nix
+++ b/lib/mk_computer.nix
@@ -1,4 +1,25 @@
-{ custom, hostname, inputs, pkgs, system ? "x86_64-linux", home-module ? "headless" }: inputs.nixpkgs.lib.nixosSystem {
+{ custom, hostname, inputs, system ? "x86_64-linux", home-module ? "headless" }:
+let
+  overlay-unstable = final: prev: {
+    unstable = import inputs.nixpkgs-unstable {
+      system = system;
+      config.allowUnfree = true;
+    };
+  };
+
+  pkgs = import inputs.nixpkgs {
+    inherit system;
+    config = {
+      allowUnfree = true;
+    };
+    overlays = [
+      overlay-unstable
+      inputs.nix-alien.overlay
+    ];
+  };
+in
+inputs.nixpkgs.lib.nixosSystem
+{
   inherit system pkgs;
   specialArgs = { inherit custom inputs; };
   modules = (