diff --git a/cros/daemon_chromeos.cc b/cros/daemon_chromeos.cc
index 5fa24ea..366fb9a 100644
--- a/cros/daemon_chromeos.cc
+++ b/cros/daemon_chromeos.cc
@@ -45,7 +45,7 @@
   // TODO(deymo): Move the initialization to a factory method avoiding the
   // explicit re-usage of the |bus| instance, shared between D-Bus service and
   // D-Bus client calls.
-  RealSystemState::CreateInstance();
+  RealSystemState::SetInstance(&system_state_);
 
   // Create the DBus service.
   dbus_adaptor_.reset(new UpdateEngineAdaptor());