diff --git a/flake.lock b/flake.lock
index 707f2af..673a8d5 100644
--- a/flake.lock
+++ b/flake.lock
@@ -33,39 +33,7 @@
         "type": "gitlab"
       }
     },
-    "blobs_2": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1604995301,
-        "narHash": "sha256-wcLzgLec6SGJA8fx1OEN1yV/Py5b+U5iyYpksUY/yLw=",
-        "owner": "simple-nixos-mailserver",
-        "repo": "blobs",
-        "rev": "2cccdf1ca48316f2cfd1c9a0017e8de5a7156265",
-        "type": "gitlab"
-      },
-      "original": {
-        "owner": "simple-nixos-mailserver",
-        "repo": "blobs",
-        "type": "gitlab"
-      }
-    },
     "flake-compat": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1696426674,
-        "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
-        "type": "github"
-      },
-      "original": {
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "type": "github"
-      }
-    },
-    "flake-compat_2": {
       "flake": false,
       "locked": {
         "lastModified": 1673956053,
@@ -81,7 +49,7 @@
         "type": "github"
       }
     },
-    "flake-compat_3": {
+    "flake-compat_2": {
       "flake": false,
       "locked": {
         "lastModified": 1696426674,
@@ -171,27 +139,6 @@
         "type": "github"
       }
     },
-    "mail": {
-      "inputs": {
-        "blobs": "blobs",
-        "flake-compat": "flake-compat",
-        "nixpkgs": "nixpkgs_3",
-        "nixpkgs-24_05": "nixpkgs-24_05"
-      },
-      "locked": {
-        "lastModified": 1722877200,
-        "narHash": "sha256-qgKDNJXs+od+1UbRy62uk7dYal3h98I4WojfIqMoGcg=",
-        "owner": "simple-nixos-mailserver",
-        "repo": "nixos-mailserver",
-        "rev": "af7d3bf5daeba3fc28089b015c0dd43f06b176f2",
-        "type": "gitlab"
-      },
-      "original": {
-        "owner": "simple-nixos-mailserver",
-        "repo": "nixos-mailserver",
-        "type": "gitlab"
-      }
-    },
     "nix-github-actions": {
       "inputs": {
         "nixpkgs": [
@@ -216,9 +163,9 @@
     },
     "nix-minecraft": {
       "inputs": {
-        "flake-compat": "flake-compat_2",
+        "flake-compat": "flake-compat",
         "flake-utils": "flake-utils",
-        "nixpkgs": "nixpkgs_4"
+        "nixpkgs": "nixpkgs_3"
       },
       "locked": {
         "lastModified": 1724982042,
@@ -236,10 +183,10 @@
     },
     "nixos-mailserver": {
       "inputs": {
-        "blobs": "blobs_2",
-        "flake-compat": "flake-compat_3",
-        "nixpkgs": "nixpkgs_5",
-        "nixpkgs-24_05": "nixpkgs-24_05_2",
+        "blobs": "blobs",
+        "flake-compat": "flake-compat_2",
+        "nixpkgs": "nixpkgs_4",
+        "nixpkgs-24_05": "nixpkgs-24_05",
         "utils": "utils"
       },
       "locked": {
@@ -286,21 +233,6 @@
         "type": "indirect"
       }
     },
-    "nixpkgs-24_05_2": {
-      "locked": {
-        "lastModified": 1717144377,
-        "narHash": "sha256-F/TKWETwB5RaR8owkPPi+SPJh83AQsm6KrQAlJ8v/uA=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "805a384895c696f802a9bf5bf4720f37385df547",
-        "type": "github"
-      },
-      "original": {
-        "id": "nixpkgs",
-        "ref": "nixos-24.05",
-        "type": "indirect"
-      }
-    },
     "nixpkgs-unstable": {
       "locked": {
         "lastModified": 1724224976,
@@ -334,21 +266,6 @@
       }
     },
     "nixpkgs_3": {
-      "locked": {
-        "lastModified": 1717602782,
-        "narHash": "sha256-pL9jeus5QpX5R+9rsp3hhZ+uplVHscNJh8n8VpqscM0=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "e8057b67ebf307f01bdcc8fba94d94f75039d1f6",
-        "type": "github"
-      },
-      "original": {
-        "id": "nixpkgs",
-        "ref": "nixos-unstable",
-        "type": "indirect"
-      }
-    },
-    "nixpkgs_4": {
       "locked": {
         "lastModified": 1715266358,
         "narHash": "sha256-doPgfj+7FFe9rfzWo1siAV2mVCasW+Bh8I1cToAXEE4=",
@@ -364,7 +281,7 @@
         "type": "github"
       }
     },
-    "nixpkgs_5": {
+    "nixpkgs_4": {
       "locked": {
         "lastModified": 1717602782,
         "narHash": "sha256-pL9jeus5QpX5R+9rsp3hhZ+uplVHscNJh8n8VpqscM0=",
@@ -379,7 +296,7 @@
         "type": "indirect"
       }
     },
-    "nixpkgs_6": {
+    "nixpkgs_5": {
       "locked": {
         "lastModified": 1724242322,
         "narHash": "sha256-HMpK7hNjhEk4z5SFg5UtxEio9OWFocHdaQzCfW1pE7w=",
@@ -416,10 +333,9 @@
         "hardware": "hardware",
         "home-manager": "home-manager",
         "jovian-nixos": "jovian-nixos",
-        "mail": "mail",
         "nix-minecraft": "nix-minecraft",
         "nixos-mailserver": "nixos-mailserver",
-        "nixpkgs": "nixpkgs_6",
+        "nixpkgs": "nixpkgs_5",
         "nixpkgs-unstable": "nixpkgs-unstable",
         "nur": "nur"
       }
diff --git a/flake.nix b/flake.nix
index 263d1e6..e99fb9a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,5 +1,5 @@
 {
-  description = "Jimbo's Nix Flake";
+  description = "Jimbo's systems as a flake";
 
   inputs = {
     # Nixpkgs
@@ -10,8 +10,6 @@
     blender-bin.url = "https://flakehub.com/f/edolstra/blender-bin/1.0.8.tar.gz";
     nix-minecraft.url = "github:Infinidoge/nix-minecraft";
     jovian-nixos.url = "github:Jovian-Experiments/Jovian-NixOS";
-
-    # NixOS utils
     hardware.url = "github:nixos/nixos-hardware/master";
 
     # Home manager
@@ -24,6 +22,7 @@
   outputs = {
     self,
     nixpkgs,
+    nixpkgs-unstable,
     nur,
     nixos-mailserver,
     blender-bin,
@@ -41,10 +40,6 @@
     # Accessible through 'nix build', 'nix shell', etc
     packages = forAllSystems (system: import ./pkgs nixpkgs.legacyPackages.${system});
 
-    # Formatter for your nix files, available through 'nix fmt'
-    # Other options beside 'alejandra' include 'nixpkgs-fmt'
-    formatter = forAllSystems (system: nixpkgs.legacyPackages.${system}.alejandra);
-
     # Your custom packages and modifications, exported as overlays
     overlays = import ./overlays {inherit inputs;};
 
@@ -66,7 +61,7 @@
 	  nixos-mailserver.nixosModule
         ];
       };
-      JimDeck = nixpkgs.lib.nixosSystem {
+      JimDeck = nixpkgs-unstable.lib.nixosSystem {
         specialArgs = {inherit inputs outputs;};
         modules = [
           ./nixos/deck.nix
@@ -97,7 +92,7 @@
         pkgs = nixpkgs-unstable.legacyPackages.x86_64-linux;
         extraSpecialArgs = {inherit inputs outputs;};
         modules = [
-          ./home-manager/jimbo_server.nix
+          ./home-manager/jimbo_deck.nix
         ];
       };
       # Derivation for ssh envrionments on other people's servers
diff --git a/nixos/deck.nix b/nixos/deck.nix
index cebf702..214b138 100644
--- a/nixos/deck.nix
+++ b/nixos/deck.nix
@@ -36,5 +36,5 @@
     ./services/mpd.nix
   ];
 
-  networking.hostName = "JimDesktop";
+  networking.hostName = "JimDeck";
 }
diff --git a/nixos/hardware/machines/deck.nix b/nixos/hardware/machines/deck.nix
index beaad97..3e3f66c 100644
--- a/nixos/hardware/machines/deck.nix
+++ b/nixos/hardware/machines/deck.nix
@@ -7,7 +7,6 @@
   # Set all boot options
   boot = {
     # Set a kernel version and load/blacklist drivers    
-    kernelPackages = pkgs.linux_jovian;    
     blacklistedKernelModules = [
       "pcspkr"
     ];