diff --git a/flake.nix b/flake.nix
index ecabc9a..810e171 100644
--- a/flake.nix
+++ b/flake.nix
@@ -51,18 +51,18 @@
       flake.homeModules.${moduleName} = func;
     };
 
-    mkStandardFeatureFlakeModule = moduleName: { optionName, optionDefinition, systemConfig, homeConfig }: {
-      imports = [ (mkMirroredModulesFlakeModule "${moduleName}Options" ({ lib, ... }: {
+    mkStandardFeature = {
+      flakeModule = moduleName: optionName: optionDefinition: (mkMirroredModulesFlakeModule "${moduleName}Options" ({ lib, ... }: {
         options = setAttrByStrPath optionName optionDefinition;
-      })) ];
+      }));
 
-      flake.nixosModules.${moduleName} = { lib, config, ... }: {
+      nixosModule = { config, optionName }: systemConfig: {
         config = lib.mkIf (attrByStrPath optionName config) (mkIfElse (config.features.nixos.home-manager.enable) {
           home-manager.users.${config.info.userName}.${optionName} = lib.mkDefault true;
         } systemConfig);
       };
 
-      flake.homeModules.${moduleName} = { lib, config, ... }: {
+      homeModule = { config, optionName }: homeConfig: {
         config = lib.mkIf (attrByStrPath optionName config) homeConfig;
       };
     };