diff --git a/flake.nix b/flake.nix
index 08cfac79..177f7ab0 100644
--- a/flake.nix
+++ b/flake.nix
@@ -226,8 +226,8 @@
         isNix = true;
         isServer = true;
       };
-      rpi = mkDevice {
-        name = "rpi";
+      ude = mkDevice {
+        name = "ude";
         system = "aarch64-linux";
         user = "servius";
         hasGui = false;
@@ -265,6 +265,7 @@
         then device.isNix
         else false;
       isDarwin = !isNull (builtins.match ".*-darwin" device.system);
+      isArm = !isNull (builtins.match "aarch64-.*" device.system);
       hasGui =
         if (builtins.hasAttr "hasGui" device)
         then device.hasGui
@@ -281,7 +282,7 @@
     nixos_devices = nixpkgs.lib.attrsets.filterAttrs (n: x: x.isNix) devices;
     linux_devices = nixpkgs.lib.attrsets.filterAttrs (n: x: x.isLinux) devices;
     darwin_devices = nixpkgs.lib.attrsets.filterAttrs (n: x: x.isDarwin) devices;
-    rpi_devices = nixpkgs.lib.attrsets.filterAttrs (n: x: n == "rpi") devices;
+    rpi_devices = nixpkgs.lib.attrsets.filterAttrs (n: x: x.isArm && x.isLinux) devices;
 
     overlays = import ./overlays.nix {
       inherit inputs;
@@ -294,7 +295,7 @@
           devices = nixos_devices;
         })
         // (
-          import ./rpi {
+          import ./nixos/ude {
             inherit inputs nixpkgs home-manager overlays nur nixos-rpi;
             devices = rpi_devices;
           }
diff --git a/rpi/configuration.nix b/nixos/ude/configuration.nix
similarity index 95%
rename from rpi/configuration.nix
rename to nixos/ude/configuration.nix
index f538afa7..a697c24a 100644
--- a/rpi/configuration.nix
+++ b/nixos/ude/configuration.nix
@@ -4,7 +4,7 @@
   lib,
   ...
 }: {
-  networking.hostName = "xatu";
+  networking.hostName = "ude";
   networking.filrewall.logRefusedConnections = lib.mkDefault false;
   networking.useNetworkd = true;
   systemd.services.NetworkManager-wait-online.enable = false;
diff --git a/rpi/default.nix b/nixos/ude/default.nix
similarity index 71%
rename from rpi/default.nix
rename to nixos/ude/default.nix
index 0de8bbf2..cd6b9bf5 100644
--- a/rpi/default.nix
+++ b/nixos/ude/default.nix
@@ -36,17 +36,6 @@
           ./configuration.nix
           {
             nixpkgs.config.allowUnfree = true;
-            # home-manager = {
-            #   backupFileExtension = "bak";
-            #   useGlobalPkgs = true;
-            #   useUserPackages = true;
-            #   extraSpecialArgs = {
-            #     inherit inputs;
-            #     inherit device;
-            #     stablePkgs = inputs.nixpkgs-stable.legacyPackages.${device.system};
-            #   };
-            #   users.${device.user}.imports = [./home];
-            # };
           }
         ];
       }