diff --git a/src/cpu/intel/model_2065x/chip.h b/src/cpu/intel/model_2065x/chip.h
index 4ee91f6821..9e89793d80 100644
--- a/src/cpu/intel/model_2065x/chip.h
+++ b/src/cpu/intel/model_2065x/chip.h
@@ -1,8 +1,5 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
-/* Magic value used to locate this chip in the device tree */
-#define SPEEDSTEP_APIC_MAGIC 0xACAC
-
 struct cpu_intel_model_2065x_config {
 	int tcc_offset;		/* TCC Activation Offset */
 };
diff --git a/src/cpu/intel/model_2065x/model_2065x_init.c b/src/cpu/intel/model_2065x/model_2065x_init.c
index fc8604089c..389989c1ae 100644
--- a/src/cpu/intel/model_2065x/model_2065x_init.c
+++ b/src/cpu/intel/model_2065x/model_2065x_init.c
@@ -20,18 +20,11 @@
 #include <smp/node.h>
 #include <types.h>
 
-static void configure_thermal_target(void)
+static void configure_thermal_target(struct device *dev)
 {
-	struct cpu_intel_model_2065x_config *conf;
-	struct device *lapic;
+	struct cpu_intel_model_2065x_config *conf = dev->bus->dev->chip_info;
 	msr_t msr;
 
-	/* Find pointer to CPU configuration */
-	lapic = dev_find_lapic(SPEEDSTEP_APIC_MAGIC);
-	if (!lapic || !lapic->chip_info)
-		return;
-	conf = lapic->chip_info;
-
 	/* Set TCC activation offset if supported */
 	msr = rdmsr(MSR_PLATFORM_INFO);
 	if ((msr.lo & (1 << 30)) && conf->tcc_offset) {
@@ -101,7 +94,7 @@ static void model_2065x_init(struct device *cpu)
 	configure_misc();
 
 	/* Thermal throttle activation offset */
-	configure_thermal_target();
+	configure_thermal_target(cpu);
 
 	/* Set Max Ratio */
 	set_max_ratio();
diff --git a/src/mainboard/lenovo/t410/devicetree.cb b/src/mainboard/lenovo/t410/devicetree.cb
index 4631b8e0e0..200cabbb92 100644
--- a/src/mainboard/lenovo/t410/devicetree.cb
+++ b/src/mainboard/lenovo/t410/devicetree.cb
@@ -17,11 +17,8 @@ chip northbridge/intel/ironlake
 	register "gpu_cpu_backlight" = "0x58d"
 	register "gpu_pch_backlight" = "0x061a061a"
 
-	device cpu_cluster 0 on
-		ops ironlake_cpu_bus_ops
-		chip cpu/intel/model_2065x
-			device lapic 0 on end
-		end
+	chip cpu/intel/model_2065x
+		device cpu_cluster 0 on ops ironlake_cpu_bus_ops end
 	end
 
 	device domain 0 on
diff --git a/src/mainboard/lenovo/x201/devicetree.cb b/src/mainboard/lenovo/x201/devicetree.cb
index 73b043720b..fc7c470091 100644
--- a/src/mainboard/lenovo/x201/devicetree.cb
+++ b/src/mainboard/lenovo/x201/devicetree.cb
@@ -18,11 +18,8 @@ chip northbridge/intel/ironlake
 	register "gpu_cpu_backlight" = "0x58d"
 	register "gpu_pch_backlight" = "0x061a061a"
 
-	device cpu_cluster 0 on
-		ops ironlake_cpu_bus_ops
-		chip cpu/intel/model_2065x
-			device lapic 0 on end
-		end
+	chip cpu/intel/model_2065x
+		device cpu_cluster 0 on ops ironlake_cpu_bus_ops end
 	end
 
 	device domain 0 on
diff --git a/src/mainboard/packardbell/ms2290/devicetree.cb b/src/mainboard/packardbell/ms2290/devicetree.cb
index b49f4d57b7..db0725b480 100644
--- a/src/mainboard/packardbell/ms2290/devicetree.cb
+++ b/src/mainboard/packardbell/ms2290/devicetree.cb
@@ -18,11 +18,8 @@ chip northbridge/intel/ironlake
 	register "gpu_cpu_backlight" = "0x58d"
 	register "gpu_pch_backlight" = "0x061a061a"
 
-	device cpu_cluster 0 on
-		ops ironlake_cpu_bus_ops
-		chip cpu/intel/model_2065x
-			device lapic 0 on end
-		end
+	chip cpu/intel/model_2065x
+		device cpu_cluster 0 on ops ironlake_cpu_bus_ops end
 	end
 
 	device domain 0 on