diff --git a/hosts/nixos/artemis/configuration.nix b/hosts/nixos/artemis/configuration.nix
index 42b572d..00e553d 100644
--- a/hosts/nixos/artemis/configuration.nix
+++ b/hosts/nixos/artemis/configuration.nix
@@ -1,62 +1,28 @@
 {
   inputs,
   pkgs,
+  lib,
   ...
 }:
 {
   imports = [
     (import "${inputs.mobile-nixos}/lib/configuration.nix" { device = "oneplus-enchilada"; })
+    ../../../modules/nixos
   ];
 
-  # Allow unfree packages (needed for OnePlus firmware)
-  nixpkgs.config.allowUnfree = true;
+  osbmModules = {
+    desktopEnvironment = "gnome";
+    machineType = "mobile";
+    hardware.systemd-boot.enable = false; # Mobile devices use different bootloader
+    programs.graphical.enable = false;
+  };
 
-  # Enable SSH server (essential for mobile device access)
-  services.openssh.enable = true;
-  services.openssh.settings.PermitRootLogin = "yes"; # For initial setup
-  services.openssh.settings.PasswordAuthentication = true; # For initial setup
+  # mobile-nixos needs aliases (uses nettools instead of net-tools)
+  nixpkgs.config.allowAliases = true;
 
-  # Set root password for SSH access
-  users.users.root.password = "nixtheplanet";
-
-  # Enable GNOME Desktop Environment
-  services.xserver.enable = true;
-  services.desktopManager.gnome.enable = true;
-  services.displayManager.gdm.enable = true;
-
-  # Enable GNOME Keyring for password management
-  services.gnome.gnome-keyring.enable = true;
-
-  # Enable dconf for GNOME settings
-  programs.dconf.enable = true;
-
-  # Remove unwanted GNOME applications
-  environment.gnome.excludePackages = with pkgs; [
-    baobab # disk usage analyzer
-    cheese # photo booth
-    eog # image viewer
-    epiphany # web browser
-    simple-scan # document scanner
-    totem # video player
-    yelp # help viewer
-    evince # document viewer
-    file-roller # archive manager
-    geary # email client
-    seahorse # password manager
-    gnome-calculator
-    gnome-calendar
-    gnome-characters
-    gnome-clocks
-    gnome-contacts
-    gnome-font-viewer
-    gnome-logs
-    gnome-maps
-    gnome-music
-    gnome-screenshot
-    gnome-system-monitor
-    gnome-weather
-    gnome-disk-utility
-    pkgs.gnome-connections
+  nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [
+    "oneplus-sdm845-firmware-zstd"
+    "oneplus-sdm845-firmware"
   ];
 
   # Minimal essential packages