diff --git a/src/cpuinfo_main.cpp b/src/cpuinfo_main.cpp
index cc5e772..6e44d71 100644
--- a/src/cpuinfo_main.cpp
+++ b/src/cpuinfo_main.cpp
@@ -448,9 +448,10 @@
                 std::stringstream stream;
                 stream << std::hex << cpuPPIN;
                 std::string serialNumber(stream.str());
-                // cpuInfo->serialNumber(serialNumber);
-                setCpuProperty(conn, cpu, assetInterfaceName, "SerialNumber",
-                               serialNumber);
+                cpuInfo->uniqueIdentifier(serialNumber);
+                // Signal that the iface is added now so that ObjectMapper and
+                // others can find it.
+                cpuInfo->emit_added();
             }
 
             tryReadSSpec(conn, cpuInfo);
@@ -538,8 +539,8 @@
                     i2cDevice = defaultI2cSlaveAddr0 + cpu - 1;
                 }
                 cpuInfoMap.insert_or_assign(
-                    cpu, std::make_shared<CPUInfo>(cpu, peciAddress, i2cBus,
-                                                   i2cDevice));
+                    cpu, std::make_shared<CPUInfo>(*conn, cpu, peciAddress,
+                                                   i2cBus, i2cDevice));
 
                 getProcessorInfo(io, conn, cpu);
             }