main: Actually use the correct schema for overrides

Fix commit ae2751a68b20ab to not only pick up the keys from the
correct schema, but also use the correct schema-id for the overrides.