I looked into the KVM side since and can update that i this PR too. Are we OK with keeping the check_id function?