diff --git a/modules/beatific.nix b/modules/beatific.nix
index 044f232..d0291a5 100644
--- a/modules/beatific.nix
+++ b/modules/beatific.nix
@@ -24,31 +24,11 @@ in {
       #   beatific.defaults.${category} = false;
       # They default to true because the point is to do these things by default.
       defaults = {
-        time = mkOption {
-          type = types.bool;
-          description = "Default time zone and NTP";
-          default = true;
-        };
-
-        i18n = mkOption {
-          type = types.bool;
-          description = "Default locale settings";
-          default = true;
-        };
-
-        programs = mkOption {
-          type = types.bool;
-          description = "Default installed programs";
-          default = true;
-        };
-
+        time = mkFlag "Default time zone and NTP";
+        i18n = mkFlag "Default locale settings";
+        programs = mkFlag "Default installed programs";
         ssh = mkFlag "Enable openssh";
-
-        tvb = mkOption {
-          type = types.bool;
-          description = "Default tvb account";
-          default = true;
-        };
+        tvb = mkFlag "Default tvb account";
       };
     };
   };