Deploy user certificates and match on those instead of machine certificates.
I have not tested it, but you could see if TEAP is supported. TEAP supports doing both machine and user authentication.
However, if you deployed a user certificate to a trusted machine - the machine is already trusted.