diff --git a/flake.lock b/flake.lock
index 97a27c62..6c01d738 100644
--- a/flake.lock
+++ b/flake.lock
@@ -103,25 +103,6 @@
         "type": "github"
       }
     },
-    "deploy-rs": {
-      "inputs": {
-        "flake-compat": "flake-compat_3",
-        "nixpkgs": "nixpkgs_3",
-        "utils": "utils_5"
-      },
-      "locked": {
-        "lastModified": 1648475189,
-        "narHash": "sha256-gAGAS6IagwoUr1B0ohE3iR6sZ8hP4LSqzYLC8Mq3WGU=",
-        "owner": "serokell",
-        "repo": "deploy-rs",
-        "rev": "83e0c78291cd08cb827ba0d553ad9158ae5a95c3",
-        "type": "github"
-      },
-      "original": {
-        "id": "deploy-rs",
-        "type": "indirect"
-      }
-    },
     "devshell": {
       "flake": false,
       "locked": {
@@ -246,37 +227,6 @@
       }
     },
     "flake-compat_3": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1648199409,
-        "narHash": "sha256-JwPKdC2PoVBkG6E+eWw3j6BMR6sL3COpYWfif7RVb8Y=",
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "rev": "64a525ee38886ab9028e6f61790de0832aa3ef03",
-        "type": "github"
-      },
-      "original": {
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "type": "github"
-      }
-    },
-    "flake-compat_4": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1627913399,
-        "narHash": "sha256-hY8g6H2KFL8ownSiFeMOjwPC8P0ueXpCVEbxgda3pko=",
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "rev": "12c64ca55c1014cdc1b16ed5a804aa8576601ff2",
-        "type": "github"
-      },
-      "original": {
-        "id": "flake-compat",
-        "type": "indirect"
-      }
-    },
-    "flake-compat_5": {
       "flake": false,
       "locked": {
         "lastModified": 1627913399,
@@ -350,20 +300,6 @@
         "type": "indirect"
       }
     },
-    "flake-utils_4": {
-      "locked": {
-        "lastModified": 1631561581,
-        "narHash": "sha256-3VQMV5zvxaVLvqqUrNz3iJelLw30mIVSfZmAaauM3dA=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "7e5bf3925f6fbdfaf50a2a7ca0be2879c4261d19",
-        "type": "github"
-      },
-      "original": {
-        "id": "flake-utils",
-        "type": "indirect"
-      }
-    },
     "flakeCompat": {
       "flake": false,
       "locked": {
@@ -380,22 +316,6 @@
         "type": "github"
       }
     },
-    "gitignore-nix": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1611672876,
-        "narHash": "sha256-qHu3uZ/o9jBHiA3MEKHJ06k7w4heOhA+4HCSIvflRxo=",
-        "owner": "hercules-ci",
-        "repo": "gitignore.nix",
-        "rev": "211907489e9f198594c0eb0ca9256a1949c9d412",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hercules-ci",
-        "repo": "gitignore.nix",
-        "type": "github"
-      }
-    },
     "gomod2nix": {
       "flake": false,
       "locked": {
@@ -488,22 +408,6 @@
         "type": "github"
       }
     },
-    "lowdown-src_2": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1632468475,
-        "narHash": "sha256-NNOm9CbdA8cuwbvaBHslGbPTiU6bh1Ao+MpEPx4rSGo=",
-        "owner": "kristapsdz",
-        "repo": "lowdown",
-        "rev": "6bd668af3fd098bdd07a1bedd399564141e275da",
-        "type": "github"
-      },
-      "original": {
-        "owner": "kristapsdz",
-        "repo": "lowdown",
-        "type": "github"
-      }
-    },
     "mach-nix": {
       "flake": false,
       "locked": {
@@ -609,7 +513,7 @@
     "nix": {
       "inputs": {
         "lowdown-src": "lowdown-src",
-        "nixpkgs": "nixpkgs_4"
+        "nixpkgs": "nixpkgs_3"
       },
       "locked": {
         "lastModified": 1633098935,
@@ -650,24 +554,6 @@
         "type": "github"
       }
     },
-    "nix_2": {
-      "inputs": {
-        "lowdown-src": "lowdown-src_2",
-        "nixpkgs": "nixpkgs_5"
-      },
-      "locked": {
-        "lastModified": 1633098935,
-        "narHash": "sha256-UtuBczommNLwUNEnfRI7822z4vPA7OoRKsgAZ8zsHQI=",
-        "owner": "nixos",
-        "repo": "nix",
-        "rev": "4f496150eb4e0012914c11f0a3ff4df2412b1d09",
-        "type": "github"
-      },
-      "original": {
-        "id": "nix",
-        "type": "indirect"
-      }
-    },
     "nixlib": {
       "locked": {
         "lastModified": 1636849918,
@@ -753,51 +639,20 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1648219316,
-        "narHash": "sha256-Ctij+dOi0ZZIfX5eMhgwugfvB+WZSrvVNAyAuANOsnQ=",
+        "lastModified": 1632864508,
+        "narHash": "sha256-d127FIvGR41XbVRDPVvozUPQ/uRHbHwvfyKHwEt5xFM=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "30d3d79b7d3607d56546dd2a6b49e156ba0ec634",
+        "rev": "82891b5e2c2359d7e58d08849e4c89511ab94234",
         "type": "github"
       },
       "original": {
-        "owner": "NixOS",
-        "ref": "nixpkgs-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
+        "id": "nixpkgs",
+        "ref": "nixos-21.05-small",
+        "type": "indirect"
       }
     },
     "nixpkgs_4": {
-      "locked": {
-        "lastModified": 1632864508,
-        "narHash": "sha256-d127FIvGR41XbVRDPVvozUPQ/uRHbHwvfyKHwEt5xFM=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "82891b5e2c2359d7e58d08849e4c89511ab94234",
-        "type": "github"
-      },
-      "original": {
-        "id": "nixpkgs",
-        "ref": "nixos-21.05-small",
-        "type": "indirect"
-      }
-    },
-    "nixpkgs_5": {
-      "locked": {
-        "lastModified": 1632864508,
-        "narHash": "sha256-d127FIvGR41XbVRDPVvozUPQ/uRHbHwvfyKHwEt5xFM=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "82891b5e2c2359d7e58d08849e4c89511ab94234",
-        "type": "github"
-      },
-      "original": {
-        "id": "nixpkgs",
-        "ref": "nixos-21.05-small",
-        "type": "indirect"
-      }
-    },
-    "nixpkgs_6": {
       "locked": {
         "lastModified": 1664876616,
         "narHash": "sha256-OxZntLnFgKbGUrPJJNLMxxj4yUaN/30+LG9N81ADqZE=",
@@ -890,7 +745,6 @@
         "nixos-generators": "nixos-generators",
         "nixpkgs": "nixpkgs_2",
         "riff": "riff",
-        "serokell-nix": "serokell-nix",
         "vault-secrets": "vault-secrets",
         "webcord": "webcord"
       }
@@ -929,31 +783,6 @@
         "type": "github"
       }
     },
-    "serokell-nix": {
-      "inputs": {
-        "deploy-rs": "deploy-rs",
-        "flake-compat": "flake-compat_4",
-        "flake-utils": "flake-utils_3",
-        "gitignore-nix": "gitignore-nix",
-        "nix": "nix",
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1666982138,
-        "narHash": "sha256-dPSScyo7Y1OBsAOBksIHJ2WV1jwvjhhABPrsmjkA7LA=",
-        "owner": "serokell",
-        "repo": "serokell.nix",
-        "rev": "1b2134f93dc143589adf7efa828dacfe4a17635c",
-        "type": "github"
-      },
-      "original": {
-        "owner": "serokell",
-        "repo": "serokell.nix",
-        "type": "github"
-      }
-    },
     "stable": {
       "locked": {
         "lastModified": 1660496378,
@@ -1033,26 +862,11 @@
         "type": "github"
       }
     },
-    "utils_5": {
-      "locked": {
-        "lastModified": 1648297722,
-        "narHash": "sha256-W+qlPsiZd8F3XkzXOzAoR+mpFqzm3ekQkJNa+PIh1BQ=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "0f8662f1319ad6abf89b3380dd2722369fc51ade",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
     "vault-secrets": {
       "inputs": {
-        "flake-compat": "flake-compat_5",
-        "flake-utils": "flake-utils_4",
-        "nix": "nix_2",
+        "flake-compat": "flake-compat_3",
+        "flake-utils": "flake-utils_3",
+        "nix": "nix",
         "nixpkgs": [
           "nixpkgs"
         ]
@@ -1074,7 +888,7 @@
     "webcord": {
       "inputs": {
         "dream2nix": "dream2nix",
-        "nixpkgs": "nixpkgs_6",
+        "nixpkgs": "nixpkgs_4",
         "webcord": "webcord_2"
       },
       "locked": {
diff --git a/flake.nix b/flake.nix
index fe140439..10f73954 100644
--- a/flake.nix
+++ b/flake.nix
@@ -11,9 +11,6 @@
     colmena.url = "github:zhaofengli/colmena";
     colmena.inputs.nixpkgs.follows = "nixpkgs";
 
-    serokell-nix.url = "github:serokell/serokell.nix";
-    serokell-nix.inputs.nixpkgs.follows = "nixpkgs";
-
     vault-secrets.url = "github:serokell/vault-secrets";
     vault-secrets.inputs.nixpkgs.follows = "nixpkgs";
 
@@ -44,9 +41,8 @@
     };
   };
 
-  outputs = { self, nixpkgs, vault-secrets, serokell-nix, minecraft-servers
-    , colmena, home-manager, hyprpaper, hyprland, nixos-generators, ...
-    }@inputs:
+  outputs = { self, nixpkgs, vault-secrets, minecraft-servers, colmena
+    , home-manager, hyprpaper, hyprland, nixos-generators, ... }@inputs:
     let
       inherit (nixpkgs) lib;
       inherit (builtins) mapAttrs;
@@ -63,13 +59,16 @@
 
       # Define args each module gets access to (access to hosts is useful for DNS/DHCP)
       specialArgs = { inherit hosts flat_hosts inputs; };
-      pkgs = serokell-nix.lib.pkgsWith nixpkgs.legacyPackages.${system} [
-        (import ./nixos/pkgs)
-        vault-secrets.overlay
-        minecraft-servers.overlays.default
-        hyprpaper.overlays.default
-        hyprland.overlays.default
-      ];
+      pkgs = import nixpkgs {
+        inherit system;
+        overlays = [
+          (import ./nixos/pkgs)
+          vault-secrets.overlay
+          minecraft-servers.overlays.default
+          hyprpaper.overlays.default
+          hyprland.overlays.default
+        ];
+      };
 
       # Script to apply local colmena deployments
       apply-local = pkgs.writeScriptBin "apply-local" ''
@@ -99,7 +98,7 @@
 
       packages.${system} = {
         inherit apply-local;
-  
+
         default = colmena.packages.${system}.colmena;
 
         iso = nixos-generators.nixosGenerate {
@@ -111,9 +110,7 @@
         proxmox-lxc = nixos-generators.nixosGenerate {
           inherit system pkgs;
           format = "proxmox-lxc";
-          modules = [
-            (import ./nixos/lxc-template.nix)
-          ];
+          modules = [ (import ./nixos/lxc-template.nix) ];
         };
       };