diff --git a/flake.nix b/flake.nix
index 14e2cbf..e606c5d 100644
--- a/flake.nix
+++ b/flake.nix
@@ -60,12 +60,21 @@
           me = prev.callPackage ./packages { inherit inputs; } // { inherit inputs; };
         })];
 
+        patchOverlaysWithLinuxLava = nixpkgs: arch: ([(self: super: {
+          linuxLavaNixpkgs = import nixpkgs {
+            overlays = [ (import ./overlays/linux-lava.nix) ] ++ overlays;
+            system = arch;
+          };
+        })] ++ overlays);
+
       mkSystem =
         if !(self ? rev) then throw "Dirty git tree detected." else
         nixpkgs: name: arch: enableGUI: extraModules: nixpkgs.lib.nixosSystem {
           system = arch;
           modules = [
-            { nixpkgs.overlays = overlays; }
+            ({
+              nixpkgs.overlays = patchOverlaysWithLinuxLava nixpkgs arch;
+            })
             agenix.nixosModules.age
             catppuccin.nixosModules.catppuccin
             (./hosts + "/${name}")
@@ -93,8 +102,8 @@
 
       packages."x86_64-linux" =
         let
-          pkgs = import nixpkgs {
-            inherit overlays;
+          pkgs = import nixpkgs rec {
+            overlays = patchOverlaysWithLinuxLava nixpkgs system;
             system = "x86_64-linux";
           };
         in
diff --git a/overlays/default.nix b/overlays/default.nix
index 4d8552f..98b0cc9 100644
--- a/overlays/default.nix
+++ b/overlays/default.nix
@@ -2,7 +2,6 @@ builtins.map (path: import path) [
   ./android-studio.nix
   ./ccache.nix
   ./eww.nix
-  ./linux-lava.nix
   ./material-icons.nix
   ./rofi.nix
   ./steam.nix
diff --git a/packages/default.nix b/packages/default.nix
index c8bc839..dc903b8 100644
--- a/packages/default.nix
+++ b/packages/default.nix
@@ -1,11 +1,12 @@
 {
   callPackage,
+  linuxLavaNixpkgs,
   inputs
 }: rec {
   discord-tokyonight = callPackage ./discord-tokyonight { inherit inputs; };
   discover-overlay = callPackage ./discover { inherit inputs; };
   epson-201112j = callPackage ./epson-201112j { };
-  linux-lava = callPackage ./linux-lava { inherit inputs; };
+  linux-lava = linuxLavaNixpkgs.callPackage ./linux-lava { inherit inputs; };
   nvim-treesitter-nightly = callPackage ./nvim-treesitter-nightly { inherit inputs; };
   packwiz = callPackage ./packwiz { inherit inputs; };
   psensor = callPackage ./psensor {  };