yes, machine-id should be set now too...