diff --git a/lib/checks.nix b/lib/checks.nix
index e34c39d..4ea1111 100644
--- a/lib/checks.nix
+++ b/lib/checks.nix
@@ -5,14 +5,15 @@
 }:
 let
   inherit (builtins) map;
-  inherit (lib) pkgFromSystem pkgsFromSystem;
+  inherit (lib) pkgFromSystem pkgsFromSystem overlayFrom;
   pkgs = import inputs.nixpkgs {
     inherit system;
-    overlays = [
-      inputs.lix-module.overlays.default
-      inputs.hyprland-contrib.overlays.default
-      inputs.nixpkgs-wayland.overlay
-    ];
+    overlays = map [
+      "lix-module"
+      "hyprland-contrib"
+      "nixpkgs-wayland"    ]
+      overlayFrom
+      ;
   };
   pkgsFrom = pkgsFromSystem system;
   pkgFrom = pkgFromSystem system;
diff --git a/lib/extended.nix b/lib/extended.nix
index d333a03..0a31095 100644
--- a/lib/extended.nix
+++ b/lib/extended.nix
@@ -75,6 +75,7 @@ let
   # defaultPackageGeneric = system: flake: "${flake}.packages.${system}.default";
   pkgsFromSystem = system: flake: inputs."${flake}".packages."${system}";
   pkgFromSystem = system: flake: (pkgsFromSystem system flake).default;
+  overlayFrom = flake: inputs."${flake}".overlays.default;
 in
 {
   inherit
@@ -91,5 +92,6 @@ in
     flakeVer
     pkgsFromSystem
     pkgFromSystem
+    overlayFrom
     ;
 }
diff --git a/modules/desktop/window-managers/hyprland.nix b/modules/desktop/window-managers/hyprland.nix
index 70198db..33f3d1d 100644
--- a/modules/desktop/window-managers/hyprland.nix
+++ b/modules/desktop/window-managers/hyprland.nix
@@ -6,6 +6,7 @@
   enabled,
   pkgFrom,
   pkgsFrom,
+overlayFrom,
   ...
 }:
 
@@ -56,8 +57,8 @@ mkOizysModule config "hyprland" {
     ]);
 
   nixpkgs.overlays = [
-    inputs.hyprland-contrib.overlays.default
-    # inputs.nixpkgs-wayland.overlay
-    # inputs.hyprland.overlays.default
+    (overlayFrom "hyprland-contrib")
+    # (overlayFrom "nixpkgs-wayland")
+    # (overlayFrom "hyprland")
   ];
 }