registry = zavai.Registry()
# Register main factories
-registry.register("dbus.system_bus", lambda *args, **kw: dbus_system_bus)
-registry.register("conf", lambda *args, **kw: conf)
-registry.register("app", zavai.Zavai)
-registry.register("menu", zavai.Menu)
-registry.register("gps", zavai.GPS)
+registry.register("dbus.system_bus", dbus_system_bus)
+registry.register("conf", conf)
+registry.register_factory("app", zavai.Zavai)
+registry.register_factory("gps", zavai.GPS)
# Load plugins
zavai.info("Loading plugins")