Correct. That's why Wickard and its progeny are so pernicious. They have expanded the scope of what is deemed Proper for Congress to regulate.
Scalia not only endorsed Wickard as Proper, he expanded its reach to include intrastate activities that do not themselves substantially affect interstate commerce, if they are Necessary to make the regulation effective.
It is why we must send virtuous people grounded in the Constitution to Congress and the Presidency. To rely solely on one branch to protect our liberties, the Supreme Court, is silly.