H1B Stamping for Canadian Residents/Not Citizens????

Hi, I immigrated to Canada while I was on F1 status. As now My OPT is done and I will be starting my H1B in October.

Do I Have to get H1B stamped from US embassy in Canada or I can go to CBP office get my H1B stamped as Canadian Citizens can get H1B stamped while crossing the border?

I am in same boat . if you find solution pls let me know.