diff --git a/hosts/odroid5/default.nix b/hosts/odroid5/default.nix
index 69b8911..4947e5a 100644
--- a/hosts/odroid5/default.nix
+++ b/hosts/odroid5/default.nix
@@ -7,6 +7,8 @@
 }: {
   imports = [
     ./hardware-configuration.nix
+    ./odroid-m1-setleds.nix
+    ./odroid-m1.nix
   ];
 
   nixpkgs.hostPlatform.system = "aarch64-linux";
diff --git a/hosts/odroid6/default.nix b/hosts/odroid6/default.nix
index 6cce567..92b34fb 100644
--- a/hosts/odroid6/default.nix
+++ b/hosts/odroid6/default.nix
@@ -7,6 +7,8 @@
 }: {
   imports = [
     ./hardware-configuration.nix
+    ./odroid-m1-setleds.nix
+    ./odroid-m1.nix
   ];
 
   nixpkgs.hostPlatform.system = "aarch64-linux";
diff --git a/hosts/odroid7/default.nix b/hosts/odroid7/default.nix
index 209f106..e75b0ed 100644
--- a/hosts/odroid7/default.nix
+++ b/hosts/odroid7/default.nix
@@ -7,6 +7,8 @@
 }: {
   imports = [
     ./hardware-configuration.nix
+    ./odroid-m1-setleds.nix
+    ./odroid-m1.nix
   ];
 
   nixpkgs.hostPlatform.system = "aarch64-linux";
diff --git a/hosts/odroid8/default.nix b/hosts/odroid8/default.nix
index 5a770b3..c169c13 100644
--- a/hosts/odroid8/default.nix
+++ b/hosts/odroid8/default.nix
@@ -7,6 +7,8 @@
 }: {
   imports = [
     ./hardware-configuration.nix
+    ./odroid-m1-setleds.nix
+    ./odroid-m1.nix
   ];
 
   nixpkgs.hostPlatform.system = "aarch64-linux";
diff --git a/hosts/opti1/default.nix b/hosts/opti1/default.nix
index 5a770b3..5a0bc42 100644
--- a/hosts/opti1/default.nix
+++ b/hosts/opti1/default.nix
@@ -9,16 +9,20 @@
     ./hardware-configuration.nix
   ];
 
-  nixpkgs.hostPlatform.system = "aarch64-linux";
-  networking.hostName = "odroid8";
+  nixpkgs.hostPlatform.system = "x86_64-linux";
+  networking.hostName = "opti1";
 
   networking.interfaces.end0.ipv4.addresses = [
     {
-      address = "192.168.4.228";
+      address = "192.168.4.36";
       prefixLength = 24;
     }
   ];
 
   networking.defaultGateway = "192.168.4.1";
   networking.nameservers = ["192.168.4.1" "8.8.8.8"];
+    # Bootloader.
+  boot.loader.grub.enable = true;
+  boot.loader.grub.device = "/dev/nvme0n1";
+  boot.loader.grub.useOSProber = true;
 }
diff --git a/modules/common.nix b/modules/common.nix
index 5f808a3..df2f6a1 100644
--- a/modules/common.nix
+++ b/modules/common.nix
@@ -10,8 +10,6 @@
     # ./mnt-clusterstore.nix
     ./nomad.nix
     ./consul.nix
-    ./odroid-m1-setleds.nix
-    ./odroid-m1.nix
     ./cifs.nix
     inputs.sops-nix.nixosModules.sops
   ];