diff --git a/hosts/darwinHosts/prometheus/configuration.nix b/hosts/darwinHosts/prometheus/configuration.nix
index 680e5b1..a70c2b8 100644
--- a/hosts/darwinHosts/prometheus/configuration.nix
+++ b/hosts/darwinHosts/prometheus/configuration.nix
@@ -13,7 +13,6 @@
   ];
 
   osbmModules = {
-    machineType = "laptop";
     programs.neovim.enable = true;
   };
 
diff --git a/hosts/nixos/apollo/configuration.nix b/hosts/nixos/apollo/configuration.nix
index f77da2a..07e5a15 100644
--- a/hosts/nixos/apollo/configuration.nix
+++ b/hosts/nixos/apollo/configuration.nix
@@ -5,7 +5,6 @@
   ];
 
   osbmModules = {
-    machineType = "server";
     services = {
       glance.enable = true;
       # anubis.enable = true;
diff --git a/hosts/nixos/artemis/configuration.nix b/hosts/nixos/artemis/configuration.nix
index be03b9e..c3364e9 100644
--- a/hosts/nixos/artemis/configuration.nix
+++ b/hosts/nixos/artemis/configuration.nix
@@ -12,7 +12,6 @@
 
   osbmModules = {
     desktopEnvironment.gnome.enable = true;
-    machineType = "mobile";
     hardware.systemd-boot.enable = false; # Mobile devices use different bootloader
     programs.graphical.enable = false;
   };
diff --git a/hosts/nixos/harmonica/configuration.nix b/hosts/nixos/harmonica/configuration.nix
index c4d855d..0d25a44 100644
--- a/hosts/nixos/harmonica/configuration.nix
+++ b/hosts/nixos/harmonica/configuration.nix
@@ -5,7 +5,6 @@
   ];
 
   osbmModules = {
-    machineType = "server";
     hardware.systemd-boot.enable = false; # Uses extlinux bootloader
   };
 
diff --git a/hosts/nixos/pochita/configuration.nix b/hosts/nixos/pochita/configuration.nix
index a5b6bd7..9aae70c 100644
--- a/hosts/nixos/pochita/configuration.nix
+++ b/hosts/nixos/pochita/configuration.nix
@@ -12,7 +12,6 @@
   ];
 
   osbmModules = {
-    machineType = "server";
     hardware.systemd-boot.enable = false; # Raspberry Pi uses init-script bootloader
     familyUser.enable = true;
     services = {
diff --git a/hosts/nixos/tartarus/configuration.nix b/hosts/nixos/tartarus/configuration.nix
index 0a862f5..5fde18b 100644
--- a/hosts/nixos/tartarus/configuration.nix
+++ b/hosts/nixos/tartarus/configuration.nix
@@ -6,7 +6,6 @@
 
   osbmModules = {
     desktopEnvironment.plasma.enable = true;
-    machineType = "laptop";
     familyUser.enable = true;
     emulation.aarch64.enable = true;
     hardware.sound.enable = true;
diff --git a/hosts/nixos/wallfacer/configuration.nix b/hosts/nixos/wallfacer/configuration.nix
index f9c1487..39fb62a 100644
--- a/hosts/nixos/wallfacer/configuration.nix
+++ b/hosts/nixos/wallfacer/configuration.nix
@@ -4,7 +4,6 @@
     ../../../modules/nixos
   ];
   osbmModules = {
-    machineType = "server";
     services = {
       hydra.enable = true;
       atticd.enable = true;
diff --git a/hosts/nixos/ymir/configuration.nix b/hosts/nixos/ymir/configuration.nix
index 75d6eb1..592dec9 100644
--- a/hosts/nixos/ymir/configuration.nix
+++ b/hosts/nixos/ymir/configuration.nix
@@ -6,7 +6,6 @@
 
   osbmModules = {
     desktopEnvironment.plasma.enable = true;
-    machineType = "desktop";
     familyUser.enable = true;
     programs = {
       adbFastboot.enable = true;
diff --git a/modules/nixos/options.nix b/modules/nixos/options.nix
index 7b998c2..940e5fa 100644
--- a/modules/nixos/options.nix
+++ b/modules/nixos/options.nix
@@ -19,19 +19,6 @@
       };
     };
 
-    # Machine Type
-    machineType = lib.mkOption {
-      type = lib.types.enum [
-        "desktop"
-        "laptop"
-        "server"
-        "embedded"
-        "mobile"
-      ];
-      default = "server";
-      description = "Type of machine for appropriate defaults";
-    };
-
     defaultUser = lib.mkOption {
       type = lib.types.str;
       default = "osbm";