diff --git a/flake.nix b/flake.nix
index 9cbbbde..4ec2e5a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -15,9 +15,12 @@
     lib = pkgs.lib;
     vmixLib = import ./lib { inherit pkgs lib system; };
   in {
-    overlays.default = import ./overlay.nix;
+    overlays.default = final: prev: { inherit vmixLib; };
 
-    nixosModules.default = import ./module.nix;
+    nixosModules.default = { config, pkgs, lib, ... }: {
+      imports = [ ./nixos/default.nix ];
+      config.nixpkgs.overlays = [ self.overlays.default ];
+    };
 
     lib.${system} = vmixLib;
 
diff --git a/module.nix b/module.nix
deleted file mode 100644
index 1f26736..0000000
--- a/module.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{ ... }:
-{
-  imports = [
-    ./nixos/default.nix
-  ];
-}
\ No newline at end of file
diff --git a/nixos/default.nix b/nixos/default.nix
index 2944e04..75dce49 100644
--- a/nixos/default.nix
+++ b/nixos/default.nix
@@ -1,7 +1,7 @@
 { config, pkgs, lib, ... }:
 with lib;
 let
-  vmixLib = import ./../lib {inherit pkgs lib; };
+  vmixLib = pkgs.vmixLib;
   args = { inherit config pkgs lib vmixLib; };
 in
 {
@@ -15,6 +15,4 @@ in
       (types.submodule (import ./namespaceSubmoduleOptions.nix args));
     default = {};
   };
-
-  config.nixpkgs.overlays = [ (import ../overlay.nix) ];
-}
\ No newline at end of file
+}
diff --git a/overlay.nix b/overlay.nix
deleted file mode 100644
index 0f26929..0000000
--- a/overlay.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-final: prev:
-let
-  # Pin vmixLib to nixpkgs 25-11 so all VM images are built with a consistent toolchain
-  vmixPkgs = prev.v25-11 or prev;
-in {
-  vmixLib = vmixPkgs.callPackage ./lib {};
-}
\ No newline at end of file