diff --git a/flake.nix b/flake.nix
index 177277d..cc11a78 100644
--- a/flake.nix
+++ b/flake.nix
@@ -11,30 +11,17 @@
   };
   
   outputs = { self, nixpkgs, sops-nix, me-emacs, nix-darwin, home-manager }@attrs: let
-    hydraGitea = (final: prev: {
-      hydra_unstable = prev.hydra_unstable.overrideAttrs
-        (old: {
-          doCheck = false;
-          patches = [
-            (final.fetchpatch {
-              name = "hydra-gitea-push-patch";
-              url = "https://patch-diff.githubusercontent.com/raw/NixOS/hydra/pull/1227.patch";
-              sha256 = "A4dN/4zLMKLYaD38lu87lzAWH/3EUM7G5njx7Q4W47w=";
-            })
-          ];
-        });
-    });
-    nvidiaContainer = import ./nvidiacontainer-overlay.nix nixpkgs;
+    hydraGitea = import ./overlays/hydra.nix;
+    nvidiaContainer = import ./overlays/nvidiacontainer.nix nixpkgs;
+    me-emacs-overlay = me-emacs.overlays.default;
 
     # Configuration for `nixpkgs`
     nixpkgsConfig = {
       config = { allowUnfree = true; };
     };
-    me-emacs-overlay = me-emacs.overlays.default;
 
     pkgs_linux-x86_64 = nixpkgs.legacyPackages."x86-linux";
     pkgs_linux-aarch64 = nixpkgs.legacyPackages."aarch64-linux";
-
   in {
     nixosConfigurations = {
       nixos = nixpkgs.lib.nixosSystem {
diff --git a/overlays/hydra.nix b/overlays/hydra.nix
new file mode 100644
index 0000000..e25d8f2
--- /dev/null
+++ b/overlays/hydra.nix
@@ -0,0 +1,13 @@
+(final: prev: {
+  hydra_unstable = prev.hydra_unstable.overrideAttrs
+    (old: {
+      doCheck = false;
+      patches = [
+        (final.fetchpatch {
+          name = "hydra-gitea-push-patch";
+          url = "https://patch-diff.githubusercontent.com/raw/NixOS/hydra/pull/1227.patch";
+          sha256 = "A4dN/4zLMKLYaD38lu87lzAWH/3EUM7G5njx7Q4W47w=";
+        })
+      ];
+    });
+});
diff --git a/nvidiacontainer-overlay.nix b/overlays/nvidiacontainer.nix
similarity index 100%
rename from nvidiacontainer-overlay.nix
rename to overlays/nvidiacontainer.nix