diff --git a/flake.nix b/flake.nix
index 3ea2145..ee57b67 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,7 +1,7 @@
 {
   description = "Manage flatpak apps declaratively.";
 
-  outputs = { self, ... }:
+  outputs = _:
     {
       nixosModules = { nix-flatpak = import ./modules/nixos.nix; };
       homeManagerModules = { nix-flatpak = import ./modules/home-manager.nix; };
diff --git a/modules/home-manager.nix b/modules/home-manager.nix
index cc5c411..2971534 100644
--- a/modules/home-manager.nix
+++ b/modules/home-manager.nix
@@ -5,7 +5,7 @@ let
 in
 {
 
-  options.services.flatpak = (import ./options.nix { inherit cfg lib pkgs; })
+  options.services.flatpak = (import ./options.nix { inherit lib pkgs; })
   // {
     enable = with lib; mkOption {
       type = types.bool;
@@ -14,7 +14,7 @@ in
     };
   };
 
-  config = lib.mkIf (config.services.flatpak.enable) {
+  config = lib.mkIf config.services.flatpak.enable {
     systemd.user.services."flatpak-managed-install" = {
       Unit = {
         After = [
@@ -28,7 +28,7 @@ in
       };
       Service = {
         Type = "oneshot";
-        ExecStart = "${import ./installer.nix {inherit cfg pkgs lib; installation = installation; }}";
+        ExecStart = import ./installer.nix { inherit cfg pkgs lib installation; };
       };
     };
 
@@ -36,7 +36,7 @@ in
       Unit.Description = "flatpak update schedule";
       Timer = {
         Unit = "flatpak-managed-install";
-        OnCalendar = "${config.services.flatpak.update.auto.onCalendar}";
+        OnCalendar = config.services.flatpak.update.auto.onCalendar;
         Persistent = "true";
       };
       Install.WantedBy = [ "timers.target" ];
diff --git a/modules/nixos.nix b/modules/nixos.nix
index aab9eaf..39d8013 100644
--- a/modules/nixos.nix
+++ b/modules/nixos.nix
@@ -4,7 +4,7 @@ let
   installation = "system";
 in
 {
-  options.services.flatpak = import ./options.nix { inherit cfg lib pkgs; };
+  options.services.flatpak = import ./options.nix { inherit lib pkgs; };
 
   config = lib.mkIf config.services.flatpak.enable {
     systemd.services."flatpak-managed-install" = {
@@ -16,13 +16,13 @@ in
       ];
       serviceConfig = {
         Type = "oneshot";
-        ExecStart = "${import ./installer.nix {inherit cfg pkgs lib; installation = installation; }}";
+        ExecStart = import ./installer.nix { inherit cfg pkgs lib installation; };
       };
     };
     systemd.timers."flatpak-managed-install" = lib.mkIf config.services.flatpak.update.auto.enable {
       timerConfig = {
         Unit = "flatpak-managed-install";
-        OnCalendar = "${config.services.flatpak.update.auto.onCalendar}";
+        OnCalendar = config.services.flatpak.update.auto.onCalendar;
         Persistent = "true";
       };
       wantedBy = [ "timers.target" ];
diff --git a/modules/options.nix b/modules/options.nix
index bffcbb3..4260d72 100644
--- a/modules/options.nix
+++ b/modules/options.nix
@@ -1,9 +1,7 @@
-{ cfg, lib, pkgs, ... }:
+{ lib, ... }:
 with lib;
 let
-  cfg = config.services.flatpak;
-
-  remoteOptions = { cfg, ... }: {
+  remoteOptions = _: {
     options = {
       name = mkOption {
         type = types.str;
@@ -24,7 +22,7 @@ let
     };
   };
 
-  packageOptions = { cfg, ... }: {
+  packageOptions = _: {
     options = {
       appId = mkOption {
         type = types.str;
@@ -45,7 +43,7 @@ let
     };
   };
 
-  updateOptions = { cfg, ... }: {
+  updateOptions = _: {
     options = {
       onActivation = mkOption {
         type = types.bool;
@@ -59,7 +57,7 @@ let
         '';
       };
       auto = mkOption {
-        type = with types; submodule ({ cfg, ... }: {
+        type = with types; submodule (_: {
           options = {
             enable = mkOption {
               type = types.bool;