Parse /etc/os-release for full fields, instead of just the CPE file.
Read dbus machine-id as well in the uuid plugin.