diff --git a/modules/onion-services.nix b/modules/onion-services.nix
index 192ac87..490f136 100644
--- a/modules/onion-services.nix
+++ b/modules/onion-services.nix
@@ -43,18 +43,18 @@ let
   cfg = config.nix-bitcoin.onionServices;
   nbLib = config.nix-bitcoin.lib;
 
-  services = builtins.attrNames cfg;
+  onionServices = builtins.attrNames cfg;
 
   activeServices = builtins.filter (service:
     config.services.${service}.enable && cfg.${service}.enable
-  ) services;
+  ) onionServices;
 
   publicServices = builtins.filter (service: cfg.${service}.public) activeServices;
 in {
   inherit options;
 
   config = mkMerge [
-    (mkIf (cfg != {}) {
+    (mkIf (activeServices != []) {
       # Define hidden services
       services.tor = {
         enable = true;
@@ -93,7 +93,7 @@ in {
         publicServices' = builtins.filter (service:
           let srv = cfg.${service};
           in srv.public && srv.enable
-        ) services;
+        ) onionServices;
       in genAttrs publicServices' (service: {
         getPublicAddressCmd = "cat ${config.nix-bitcoin.onionAddresses.dataDir}/services/${service}";
       });