diff --git a/flake.nix b/flake.nix
index 2b30260..a87d049 100644
--- a/flake.nix
+++ b/flake.nix
@@ -17,6 +17,8 @@
     let
         system = "x86_64-linux";  # TOOD: Add options for MacOS
 
+        unstable-overlays = import ./src/utils/nixFilesIn.nix nixpkgs-unstable.lib ./src/unstable-overlays;
+
         pkgs = import nixpkgs {
             inherit system;
 
@@ -26,6 +28,7 @@
         pkgs-unstable = import nixpkgs-unstable {
             inherit system;
 
+            overlays = map (f: import f) unstable-overlays;
             config = { allowUnfree = true; };
         };
 
diff --git a/src/system.nix b/src/system.nix
index 4afd43f..3c3bbe7 100644
--- a/src/system.nix
+++ b/src/system.nix
@@ -10,7 +10,7 @@
 
   # Prepare nix flakes
   nix = {
-    package = pkgs-unstable.nix;
+    package = pkgs-unstable.nixFlakes;
     extraOptions = ''
       experimental-features = nix-command flakes
       auto-optimise-store = true
@@ -93,7 +93,7 @@
         xdg-desktop-portal-kde
       ];
       gtkUsePortal = true;
-      wlr.enable = true;     
+      wlr.enable = true;
     };
   };
 
diff --git a/src/unstable-overlays/maintainers.nix b/src/unstable-overlays/maintainers.nix
new file mode 100644
index 0000000..46d40f3
--- /dev/null
+++ b/src/unstable-overlays/maintainers.nix
@@ -0,0 +1,10 @@
+final: prev:  {
+  lib = prev.lib.recursiveUpdate prev.lib {
+    maintainers.minion3665 = {
+      email = "skyler3665@gmail.com";
+      github = "minion3665";
+      githubId = 34243578;
+      name = "Skyler Grey";
+    };
+  };
+}
diff --git a/src/overlays/nix.nix b/src/unstable-overlays/nix.nix
similarity index 70%
rename from src/overlays/nix.nix
rename to src/unstable-overlays/nix.nix
index 0f715dc..04eb7db 100644
--- a/src/overlays/nix.nix
+++ b/src/unstable-overlays/nix.nix
@@ -1,5 +1,5 @@
 final: prev:  {
-  nix = prev.nix.overrideAttrs (old: {
+  nixFlakes = prev.nixFlakes.overrideAttrs (old: {
     patches = (old.patches or []) ++ [
       ./nix/5567-make-installables-expr-context.patch
     ];
diff --git a/src/overlays/nix/5567-make-installables-expr-context.patch b/src/unstable-overlays/nix/5567-make-installables-expr-context.patch
similarity index 100%
rename from src/overlays/nix/5567-make-installables-expr-context.patch
rename to src/unstable-overlays/nix/5567-make-installables-expr-context.patch