diff --git a/checks/pre-commit.nix b/checks/pre-commit.nix
index 120cb2bf..7a2192a6 100644
--- a/checks/pre-commit.nix
+++ b/checks/pre-commit.nix
@@ -1,6 +1,6 @@
 { inputs, ... }:
 {
-  flake.flakeModules.git-hooks =
+  flake.modules.flake.git-hooks =
     { ... }:
     {
       imports = [
diff --git a/flake.nix b/flake.nix
index 920678ea..265fb9e3 100644
--- a/flake.nix
+++ b/flake.nix
@@ -218,6 +218,7 @@
     in
     flake-parts.lib.mkFlake { inherit inputs; } {
       imports = [
+        inputs.flake-parts.flakeModules.modules
         ./checks
         ./modules
         ./packages
diff --git a/modules/folder-size-metrics/default.nix b/modules/folder-size-metrics/default.nix
index 5c40e647..bb0e8bc7 100644
--- a/modules/folder-size-metrics/default.nix
+++ b/modules/folder-size-metrics/default.nix
@@ -1,6 +1,6 @@
 { withSystem, ... }:
 {
-  flake.nixosModules.folder-size-metrics =
+  flake.modules.nixos.folder-size-metrics =
     {
       pkgs,
       config,
diff --git a/modules/grafana-agent-flow/default.nix b/modules/grafana-agent-flow/default.nix
index 888bfa3f..87d93612 100644
--- a/modules/grafana-agent-flow/default.nix
+++ b/modules/grafana-agent-flow/default.nix
@@ -1,6 +1,6 @@
 { withSystem, ... }:
 {
-  flake.nixosModules.grafana-agent-flow =
+  flake.modules.nixos.grafana-agent-flow =
     {
       pkgs,
       config,
diff --git a/modules/lido/ethereum-validators-monitoring/default.nix b/modules/lido/ethereum-validators-monitoring/default.nix
index 19b70711..51912874 100644
--- a/modules/lido/ethereum-validators-monitoring/default.nix
+++ b/modules/lido/ethereum-validators-monitoring/default.nix
@@ -1,6 +1,6 @@
 { withSystem, ... }:
 {
-  flake.nixosModules.ethereum-validators-monitoring =
+  flake.modules.nixos.ethereum-validators-monitoring =
     {
       pkgs,
       config,
diff --git a/modules/lido/keys-api/default.nix b/modules/lido/keys-api/default.nix
index 3b8b405d..a3668b4f 100644
--- a/modules/lido/keys-api/default.nix
+++ b/modules/lido/keys-api/default.nix
@@ -1,6 +1,6 @@
 { withSystem, ... }:
 {
-  flake.nixosModules.lido-keys-api =
+  flake.modules.nixos.lido-keys-api =
     {
       pkgs,
       config,
diff --git a/modules/lido/validator-ejector/default.nix b/modules/lido/validator-ejector/default.nix
index 15650d5c..fdfdeacf 100644
--- a/modules/lido/validator-ejector/default.nix
+++ b/modules/lido/validator-ejector/default.nix
@@ -1,6 +1,6 @@
 { withSystem, ... }:
 {
-  flake.nixosModules.lido-validator-ejector =
+  flake.modules.nixos.lido-validator-ejector =
     {
       pkgs,
       config,
diff --git a/modules/lido/withdrawals-automation/default.nix b/modules/lido/withdrawals-automation/default.nix
index 15e7cf0b..6dca17a1 100644
--- a/modules/lido/withdrawals-automation/default.nix
+++ b/modules/lido/withdrawals-automation/default.nix
@@ -1,6 +1,6 @@
 { withSystem, ... }:
 {
-  flake.nixosModules.lido-withdrawals-automation =
+  flake.modules.nixos.lido-withdrawals-automation =
     {
       pkgs,
       config,
diff --git a/modules/pyroscope/default.nix b/modules/pyroscope/default.nix
index 3302e87c..f9e83e5d 100644
--- a/modules/pyroscope/default.nix
+++ b/modules/pyroscope/default.nix
@@ -1,6 +1,6 @@
 { withSystem, ... }:
 {
-  flake.nixosModules.pyroscope =
+  flake.modules.nixos.pyroscope =
     {
       pkgs,
       config,
diff --git a/modules/shard-split/default.nix b/modules/shard-split/default.nix
index dd60a112..323ea520 100644
--- a/modules/shard-split/default.nix
+++ b/modules/shard-split/default.nix
@@ -3,7 +3,7 @@ let
   inherit (import ../../lib/shard-attrs.nix lib) shardAttrs;
 in
 {
-  flake.flakeModules.shardSplit =
+  flake.modules.flake.shardSplit =
     { config, ... }:
     let
       cfg = config.mcl.matrix.shard;
diff --git a/shells/default.nix b/shells/default.nix
index adb62e86..dd0031bd 100644
--- a/shells/default.nix
+++ b/shells/default.nix
@@ -3,7 +3,7 @@
   imports = [
     (import ../checks/pre-commit.nix {
       inherit inputs;
-    }).flake.flakeModules.git-hooks
+    }).flake.modules.flake.git-hooks
   ];
 
   perSystem =