diff --git a/modules/features/niri.nix b/modules/features/niri.nix
index 9b24bb5..133e99c 100644
--- a/modules/features/niri.nix
+++ b/modules/features/niri.nix
@@ -1,5 +1,5 @@
 { self, inputs, ... }: {
-  flake.nixosModules.niri = { pkgs, lib, ... }: {
+  flake.modules.nixos.niri = { pkgs, lib, ... }: {
     programs.niri = {
       enable = true;
       package = self.packages.${pkgs.stdenv.hostPlatform.system}.myNiri;
diff --git a/modules/hosts/omen-nixos/configuration.nix b/modules/hosts/omen-nixos/configuration.nix
index 588401d..f894edc 100644
--- a/modules/hosts/omen-nixos/configuration.nix
+++ b/modules/hosts/omen-nixos/configuration.nix
@@ -1,10 +1,10 @@
 { self, inputs, ... }: {
 
-  flake.nixosModules.omen = { pkgs, lib, ... }: {
+  flake.modules.nixos.omen = { pkgs, lib, ... }: {
     # import any other modules from here
     imports = [
-      self.nixosModules.omenHardware
-      self.nixosModules.niri
+      self.modules.nixos.omenHardware
+      self.modules.nixos.niri
     ];
 
     # Use the systemd-boot EFI boot loader.
diff --git a/modules/hosts/omen-nixos/default.nix b/modules/hosts/omen-nixos/default.nix
index f5bce6b..7da7f4c 100644
--- a/modules/hosts/omen-nixos/default.nix
+++ b/modules/hosts/omen-nixos/default.nix
@@ -1,8 +1,8 @@
 { self, inputs, ... }: {
   flake.nixosConfigurations.omen = inputs.nixpkgs.lib.nixosSystem {
     modules = [
-      self.nixosModules.omen
-      self.nixosModules.john
+      self.modules.nixos.omen
+      self.modules.nixos.john
     ];
   };
 }
\ No newline at end of file
diff --git a/modules/hosts/omen-nixos/hardware.nix b/modules/hosts/omen-nixos/hardware.nix
index 3440e55..5a6870c 100644
--- a/modules/hosts/omen-nixos/hardware.nix
+++ b/modules/hosts/omen-nixos/hardware.nix
@@ -1,5 +1,5 @@
 { self, inputs, ... }: {
-  flake.nixosModules.omenHardware = { config, lib, pkgs, modulesPath, ... }: {
+  flake.modules.nixos.omenHardware = { config, lib, pkgs, modulesPath, ... }: {
     imports = [
       (modulesPath + "/installer/scan/not-detected.nix")
     ];