diff --git a/hosts/mairley/default.nix b/hosts/mairley/default.nix
index d93a911..3a996c8 100644
--- a/hosts/mairley/default.nix
+++ b/hosts/mairley/default.nix
@@ -1,10 +1,4 @@
-{
-  marleylib,
-  config,
-  ...
-}: let
-  inherit (marleylib.module) enabled;
-in {
+{config, ...}: {
   networking = {
     computerName = "mairley";
     hostName = "mairley";
@@ -12,15 +6,7 @@ in {
   };
 
   marleyos = {
-    profiles.desktop = enabled;
-
-    # appearance = {
-    #   base = enabled;
-    # };
-    # programs = {
-    #   fish = enabled;
-    #   wezterm = enabled;
-    # };
+    profiles.desktop = true;
   };
 
   users = {
diff --git a/hosts/marleycentre/default.nix b/hosts/marleycentre/default.nix
index 7bf8d59..0817b2e 100644
--- a/hosts/marleycentre/default.nix
+++ b/hosts/marleycentre/default.nix
@@ -1,12 +1,10 @@
-{marleylib, ...}: let
-  inherit (marleylib.module) enabled;
-in {
+_: {
   imports = [./hardware-configuration.nix];
 
   networking.hostName = "marleycentre";
 
   marleyos = {
-    profiles.server = enabled;
+    profiles.server = true;
   };
 
   users.users = {
diff --git a/hosts/marleynet/default.nix b/hosts/marleynet/default.nix
index bb9edba..19d55f3 100644
--- a/hosts/marleynet/default.nix
+++ b/hosts/marleynet/default.nix
@@ -1,12 +1,10 @@
-{marleylib, ...}: let
-  inherit (marleylib.module) enabled;
-in {
+_: {
   imports = [./hardware-configuration.nix];
 
   networking.hostName = "marleynet";
 
   marleyos = {
-    profiles.server = enabled;
+    profiles.server = true;
     # services.ddclient = enabled;
   };
 
diff --git a/modules/nixos/base/boot.nix b/modules/nixos/base/boot.nix
index 4916884..fe907c9 100644
--- a/modules/nixos/base/boot.nix
+++ b/modules/nixos/base/boot.nix
@@ -6,7 +6,7 @@
 }: {
   boot = {
     kernelPackages =
-      lib.mkIf (!config.marleyos.profiles.server.enable)
+      lib.mkIf (!config.marleyos.profiles.server)
       pkgs.linuxPackages_xanmod;
 
     loader = {
diff --git a/modules/nixos/base/drivers.nix b/modules/nixos/base/drivers.nix
index c687026..5d410ba 100644
--- a/modules/nixos/base/drivers.nix
+++ b/modules/nixos/base/drivers.nix
@@ -4,7 +4,7 @@
   lib,
   ...
 }: {
-  config = lib.mkIf (!config.marleyos.profiles.server.enable) {
+  config = lib.mkIf (!config.marleyos.profiles.server) {
     security.rtkit.enable = true; # Used for pulseaudio.
 
     hardware.pulseaudio.enable = false;
diff --git a/modules/options/profiles.nix b/modules/options/profiles.nix
index f835b71..b7ad679 100644
--- a/modules/options/profiles.nix
+++ b/modules/options/profiles.nix
@@ -1,10 +1,10 @@
 {lib, ...}: {
   options.marleyos.profiles = {
-    desktop.enable = lib.mkEnableOption "graphical desktop profile";
-    server.enable = lib.mkEnableOption "server profile";
+    desktop = lib.mkEnableOption "graphical desktop profile";
+    server = lib.mkEnableOption "server profile";
 
     hardware = {
-      nvidia.enable = lib.mkEnableOption "Nvidia profile";
+      nvidia = lib.mkEnableOption "Nvidia profile";
     };
   };
 }